bzr commit into mysql-5.1-bugteam branch (horst.hunger:3503) Bug#52501

[Horst.Hunger]

#At file:///home/horst/bzr/mysql-5.1-bugteam/ based on revid:dmitry.shulga@stripped

 3503 Horst.Hunger	2010-11-11
      2. review update for bug#52501 fixing a syntax error, a not actual result file and replaced directory info by place holder. 

    modified:
      mysql-test/suite/sys_vars/r/general_log_file_basic.result
      mysql-test/suite/sys_vars/r/log_output_func.result
      mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
      mysql-test/suite/sys_vars/t/div_precision_increment_func.test
      mysql-test/suite/sys_vars/t/general_log_file_basic.test
      mysql-test/suite/sys_vars/t/log_output_func.test
      mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
=== modified file 'mysql-test/suite/sys_vars/r/general_log_file_basic.result'
--- a/mysql-test/suite/sys_vars/r/general_log_file_basic.result	2010-11-08 15:30:26 +0000
+++ b/mysql-test/suite/sys_vars/r/general_log_file_basic.result	2010-11-11 10:25:03 +0000
@@ -16,4 +16,4 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 WHERE VARIABLE_NAME='general_log_file';
 @@global.general_log_file = VARIABLE_VALUE
 1
-SET @@global.general_log_file= 'test.log';
+SET @@global.general_log_file= 'start_value';

=== modified file 'mysql-test/suite/sys_vars/r/log_output_func.result'
--- a/mysql-test/suite/sys_vars/r/log_output_func.result	2010-11-08 15:30:26 +0000
+++ b/mysql-test/suite/sys_vars/r/log_output_func.result	2010-11-11 10:25:03 +0000
@@ -52,7 +52,7 @@ count(*)
 DROP TABLE t1;
 connection default;
 SET @@global.general_log= 'OFF';
-SET @@global.general_log_file= '/home/horst/bzr/5.1-52501/mysql-test/var/mysqld.1/mysqld.log';
+SET @@global.general_log_file= 'start_general_log_file';
 SET @@global.log_output= @start_value;
 SET @@global.general_log= @start_general_log;
 SET @@global.general_log= 'ON';

=== modified file 'mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result'
--- a/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result	2010-11-08 15:30:26 +0000
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result	2010-11-11 10:25:03 +0000
@@ -14,4 +14,4 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 WHERE VARIABLE_NAME='slow_query_log_file';
 @@global.slow_query_log_file = VARIABLE_VALUE
 1
-SET @@global.slow_query_log_file= 'slowtest.log';
+SET @@global.slow_query_log_file= 'start_value';

=== modified file 'mysql-test/suite/sys_vars/t/div_precision_increment_func.test'
--- a/mysql-test/suite/sys_vars/t/div_precision_increment_func.test	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/div_precision_increment_func.test	2010-11-11 10:25:03 +0000
@@ -19,7 +19,7 @@
 #                                                                              #
 ################################################################################
 
-let $save_div_precision_increment = `SELECT @@global.div_precision_increment`
+let $save_div_precision_increment = `SELECT @@global.div_precision_increment`;
  
 #SET @save_div_precision_increment = @@global.div_precision_increment;
 

=== modified file 'mysql-test/suite/sys_vars/t/general_log_file_basic.test'
--- a/mysql-test/suite/sys_vars/t/general_log_file_basic.test	2010-11-08 15:30:26 +0000
+++ b/mysql-test/suite/sys_vars/t/general_log_file_basic.test	2010-11-11 10:25:03 +0000
@@ -70,6 +70,7 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 WHERE VARIABLE_NAME='general_log_file';
 
 #SET @@global.general_log_file= @start_value;
+--replace_result $start_value start_value 
 eval SET @@global.general_log_file= '$start_value';
 
 #####################################################

=== modified file 'mysql-test/suite/sys_vars/t/log_output_func.test'
--- a/mysql-test/suite/sys_vars/t/log_output_func.test	2010-11-08 15:30:26 +0000
+++ b/mysql-test/suite/sys_vars/t/log_output_func.test	2010-11-11 10:25:03 +0000
@@ -115,6 +115,7 @@ file_exists $MYSQLTEST_VARDIR/run/mytest
 connection default;
 SET @@global.general_log= 'OFF';
 #SET @@global.general_log_file= @start_general_log_file;
+--replace_result $start_general_log_file start_general_log_file
 eval SET @@global.general_log_file= '$start_general_log_file';
 SET @@global.log_output= @start_value;
 SET @@global.general_log= @start_general_log;

=== modified file 'mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test'
--- a/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test	2010-11-08 15:30:26 +0000
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test	2010-11-11 10:25:03 +0000
@@ -68,6 +68,7 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 WHERE VARIABLE_NAME='slow_query_log_file';
 
 #SET @@global.slow_query_log_file= @start_value;
+--replace_result $start_value start_value
 eval SET @@global.slow_query_log_file= '$start_value';
 #SELECT @start_value;
 #####################################################


Attachment: [text/bzr-bundle] bzr/[e-mail]