bzr commit into mysql-6.0-backup branch (hezx:2693)

[He Zhenxing]

#At file:///media/sda3/work/mysql/bzrwork/merge/6.0-rpl-merge/

 2693 He Zhenxing	2008-08-05
      Update test result after merge
modified:
  mysql-test/r/myisamlog.result
  mysql-test/r/rpl_sync_binlog_basic_64.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

=== modified file 'mysql-test/r/rpl_sync_binlog_basic_64.result'
--- a/mysql-test/r/rpl_sync_binlog_basic_64.result	2008-05-16 02:44:49 +0000
+++ b/mysql-test/r/rpl_sync_binlog_basic_64.result	2008-08-05 09:44:02 +0000
@@ -42,16 +42,16 @@ SELECT @@global.sync_binlog;
 SET @@global.sync_binlog = 4294967296;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-4294967296
+0
 SET @@global.sync_binlog = 10240022115;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-10240022115
[phone]
 SET @@global.sync_binlog = 10000.01;
 ERROR 42000: Incorrect argument type to variable 'sync_binlog'
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-10240022115
[phone]
 SET @@global.sync_binlog = -1024;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
@@ -59,24 +59,24 @@ SELECT @@global.sync_binlog;
 SET @@global.sync_binlog = 42949672950;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-42949672950
[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
-42949672950
[phone]
 SET @@global.sync_binlog = 'test';
 ERROR 42000: Incorrect argument type to variable 'sync_binlog'
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-42949672950
[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
-42949672950
[phone]
 '#----------------------FN_DYNVARS_168_06------------------------#'
 SELECT @@global.sync_binlog = VARIABLE_VALUE
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -88,7 +88,7 @@ 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
-42949672950
[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;