bzr commit into mysql-6.0 branch (sven:2692)

[Sven Sandberg]

#At file:///home/sven/bzr/merge/6.0_from_6.0-rpl/

 2692 Sven Sandberg	2008-08-05 [merge]
      merge: (development in 6.0-rpl) -> (merge 6.0 -> 6.0-rpl)
      resolved manually:
      Contents conflict in mysql-test/r/rpl_sync_binlog_basic_64.result
added:
  mysql-test/suite/sys_vars/r/rpl_sync_binlog_basic_64.result.OTHER
modified:
  mysql-test/r/myisamlog.result

=== modified file 'mysql-test/r/myisamlog.result'
--- a/mysql-test/r/myisamlog.result	2008-07-22 18:08:06 +0000
+++ b/mysql-test/r/myisamlog.result	2008-08-05 09:44:02 +0000
@@ -14,13 +14,13 @@ a	b
 truncate table t1;
 flush table t1;
 Commands                         Used count    Errors Recover errors
-open                       16         0              0
+open                       26         0              0
 write                       4         0              0
 update                      1         0              0
 delete                      1         0              0
 close                       8         0              0
 extra                       #         0              0
-lock                       48         0              0
+lock                       82         0              0
 Total               #         0                0
 select * from t1;
 a	b
@@ -29,13 +29,13 @@ Trying to update MyISAM files according 
 Tables updated successfully
 
 Commands                         Used count    Errors Recover errors
-open                       17         0              0
+open                       27         0              0
 write                       4         0              0
 update                      1         0              0
 delete                      1         0              0
 close                       9         0              0
 extra                       #         0              0
-lock                       50         0              0
+lock                       84         0              0
 Total               #         0                0
 select * from t1;
 a	b

=== added file 'mysql-test/suite/sys_vars/r/rpl_sync_binlog_basic_64.result.OTHER'
--- a/mysql-test/suite/sys_vars/r/rpl_sync_binlog_basic_64.result.OTHER	1970-01-01
00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_sync_binlog_basic_64.result.OTHER	2008-08-05
11:30:54 +0000
@@ -0,0 +1,105 @@
+SET @start_value = @@global.sync_binlog;
+SELECT @start_value;
+@start_value
+0
+'#--------------------FN_DYNVARS_168_01------------------------#'
+SET @@global.sync_binlog = 99;
+SET @@global.sync_binlog = DEFAULT;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+'#---------------------FN_DYNVARS_168_02-------------------------#'
+SET @@global.sync_binlog = @start_value;
+SELECT @@global.sync_binlog = 0;
+@@global.sync_binlog = 0
+1
+'#--------------------FN_DYNVARS_168_03------------------------#'
+SET @@global.sync_binlog = 0;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 1;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+1
+SET @@global.sync_binlog = 4294967295;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
[phone]
+SET @@global.sync_binlog = 4294967294;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
[phone]
+SET @@global.sync_binlog = 65536;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+65536
+'#--------------------FN_DYNVARS_168_04-------------------------#'
+SET @@global.sync_binlog = -1;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 4294967296;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 10240022115;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
[phone]
+SET @@global.sync_binlog = 10000.01;
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
[phone]
+SET @@global.sync_binlog = -1024;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 42949672950;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
[phone]
+'Bug # 34837: Errors are not coming on assigning invalid values to variable';
+SET @@global.sync_binlog = ON;
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
[phone]
+SET @@global.sync_binlog = 'test';
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
[phone]
+'#-------------------FN_DYNVARS_168_05----------------------------#'
+SET @@session.sync_binlog = 0;
+ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET
GLOBAL
+SELECT @@sync_binlog;
+@@sync_binlog
[phone]
+'#----------------------FN_DYNVARS_168_06------------------------#'
+SELECT @@global.sync_binlog = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='sync_binlog';
+@@global.sync_binlog = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_168_07----------------------#'
+SET sync_binlog = 1;
+ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET
GLOBAL
+SELECT @@sync_binlog;
+@@sync_binlog
[phone]
+SET local.sync_binlog = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'sync_binlog = 1' at line 1
+SELECT local.sync_binlog;
+ERROR 42S02: Unknown table 'local' in field list
+SET global.sync_binlog = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'sync_binlog = 1' at line 1
+SELECT global.sync_binlog;
+ERROR 42S02: Unknown table 'global' in field list
+SELECT sync_binlog = @@session.sync_binlog;
+ERROR 42S22: Unknown column 'sync_binlog' in 'field list'
+SET @@global.sync_binlog = @start_value;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0