MySQL Lists: commits: bk commit into 5.2 tree (serg:1.2507)

List:	Commits	« Previous Message Next Message »
From:	Sergei Golubchik	Date:	May 24 2007 8:38pm
Subject:	bk commit into 5.2 tree (serg:1.2507)
View as plain text
Below is the list of changes that have just been committed into a local
5.2 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-24 20:38:17+02:00, serg@stripped +8 -0
  after merge

  mysql-test/r/flush2.result@stripped, 2007-05-24 20:38:13+02:00, serg@stripped +0 -2
    after merge

  mysql-test/r/rpl_000015.result@stripped, 2007-05-24 20:38:13+02:00, serg@stripped +1 -1
    after merge

  mysql-test/r/rpl_row_reset_slave.result@stripped, 2007-05-24 20:38:13+02:00, serg@stripped
+6 -6
    after merge

  mysql-test/r/rpl_row_until.result@stripped, 2007-05-24 20:38:13+02:00, serg@stripped +8 -8
    after merge

  mysql-test/r/rpl_stm_reset_slave.result@stripped, 2007-05-24 20:38:13+02:00,
serg@stripped +6 -6
    after merge

  sql/mysql_priv.h@stripped, 2007-05-24 20:38:13+02:00, serg@stripped +3 -7
    after merge

  sql/rpl_mi.cc@stripped, 2007-05-24 20:38:13+02:00, serg@stripped +1 -1
    after merge

  sql/sql_yacc.yy@stripped, 2007-05-24 20:38:13+02:00, serg@stripped +2 -2
    after merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	janus.mylan
# Root:	/usr/home/serg/Abk/mysql-5.2

--- 1.510/sql/mysql_priv.h	2007-05-24 20:38:25 +02:00
+++ 1.511/sql/mysql_priv.h	2007-05-24 20:38:25 +02:00
@@ -109,17 +109,13 @@
     "The syntax 'BAD' is deprecated and will be removed in MySQL 6.2. Please
     use 'GOOD' instead"
 
- Note that in macro arguments BAD is not quoted, while 'GOOD' is.
- Note that the version is TWO numbers, separated with a comma
+ Note, that in macro arguments BAD is not quoted, while 'GOOD' is.
+ Note, that the version is TWO numbers, separated with a comma
  (two macro arguments, that is)
 */
-#ifdef compile_time_assert
-#error change the macro below to use compile_time_assert
-#endif
 #define WARN_DEPRECATED(Thd,VerHi,VerLo,Old,New)                            \
   do {                                                                      \
-    char t[MYSQL_VERSION_ID < VerHi * 10000 + VerLo * 100 ? 1 : -1]         \
-                __attribute__((unused));                                    \
+    compile_time_assert(MYSQL_VERSION_ID < VerHi * 10000 + VerLo * 100);    \
     if (Thd)                                                                \
       push_warning_printf((Thd), MYSQL_ERROR::WARN_LEVEL_WARN,              \
                         ER_WARN_DEPRECATED_SYNTAX,                          \

--- 1.570/sql/sql_yacc.yy	2007-05-24 20:38:25 +02:00
+++ 1.571/sql/sql_yacc.yy	2007-05-24 20:38:25 +02:00
@@ -491,10 +491,10 @@
 
 %pure_parser					/* We have threads */
 /*
-  Currently there is 286 shift/reduce conflict. We should not introduce
+  Currently there is 285 shift/reduce conflict. We should not introduce
   new conflicts any more.
 */
-%expect 286
+%expect 285
 
 /*
    Comments for TOKENS.

--- 1.6/mysql-test/r/flush2.result	2007-05-24 20:38:25 +02:00
+++ 1.7/mysql-test/r/flush2.result	2007-05-24 20:38:25 +02:00
@@ -4,11 +4,9 @@
 Variable_name	Value
 log_bin	OFF
 log_bin_trust_function_creators	ON
-log_bin_trust_routine_creators	ON
 flush logs;
 show variables like 'log_bin%';
 Variable_name	Value
 log_bin	OFF
 log_bin_trust_function_creators	ON
-log_bin_trust_routine_creators	ON
 set global expire_logs_days = 0;

--- 1.19/mysql-test/r/rpl_stm_reset_slave.result	2007-05-24 20:38:25 +02:00
+++ 1.20/mysql-test/r/rpl_stm_reset_slave.result	2007-05-24 20:38:25 +02:00
@@ -11,7 +11,7 @@
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	102
+Read_Master_Log_Pos	106
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -26,7 +26,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	102
+Exec_Master_Log_Pos	106
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -48,7 +48,7 @@
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	102
+Read_Master_Log_Pos	106
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -63,7 +63,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	102
+Exec_Master_Log_Pos	106
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -121,7 +121,7 @@
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	102
+Read_Master_Log_Pos	106
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -136,7 +136,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	102
+Exec_Master_Log_Pos	106
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	

--- 1.5/sql/rpl_mi.cc	2007-05-24 20:38:25 +02:00
+++ 1.6/sql/rpl_mi.cc	2007-05-24 20:38:25 +02:00
@@ -236,7 +236,7 @@
     */
     if (lines >= LINES_IN_MASTER_INFO_WITH_SSL)
     {
-      if (init_intvar_from_file(&ssl, &mi->file, master_ssl) ||
+      if (init_intvar_from_file(&ssl, &mi->file, 0) ||
           init_strvar_from_file(mi->ssl_ca, sizeof(mi->ssl_ca),
                                 &mi->file, 0) ||
           init_strvar_from_file(mi->ssl_capath, sizeof(mi->ssl_capath),

--- 1.6/mysql-test/r/rpl_row_reset_slave.result	2007-05-24 20:38:25 +02:00
+++ 1.7/mysql-test/r/rpl_row_reset_slave.result	2007-05-24 20:38:25 +02:00
@@ -11,7 +11,7 @@
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	102
+Read_Master_Log_Pos	106
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -26,7 +26,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	102
+Exec_Master_Log_Pos	106
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -48,7 +48,7 @@
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	102
+Read_Master_Log_Pos	106
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -63,7 +63,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	102
+Exec_Master_Log_Pos	106
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -121,7 +121,7 @@
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	102
+Read_Master_Log_Pos	106
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -136,7 +136,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	102
+Exec_Master_Log_Pos	106
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	

--- 1.6/mysql-test/r/rpl_row_until.result	2007-05-24 20:38:25 +02:00
+++ 1.7/mysql-test/r/rpl_row_until.result	2007-05-24 20:38:25 +02:00
@@ -26,7 +26,7 @@
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	740
+Read_Master_Log_Pos	744
 Relay_Log_File	slave-relay-bin.000003
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -41,7 +41,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	311
+Exec_Master_Log_Pos	315
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001
@@ -68,7 +68,7 @@
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	740
+Read_Master_Log_Pos	744
 Relay_Log_File	slave-relay-bin.000003
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -83,7 +83,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	311
+Exec_Master_Log_Pos	315
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-no-such-bin.000001
@@ -108,7 +108,7 @@
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	740
+Read_Master_Log_Pos	744
 Relay_Log_File	slave-relay-bin.000003
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -123,7 +123,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	586
+Exec_Master_Log_Pos	590
 Relay_Log_Space	#
 Until_Condition	Relay
 Until_Log_File	slave-relay-bin.000003
@@ -146,7 +146,7 @@
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	740
+Read_Master_Log_Pos	744
 Relay_Log_File	slave-relay-bin.000003
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -161,7 +161,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	740
+Exec_Master_Log_Pos	744
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001

--- 1.46/mysql-test/r/rpl_000015.result	2007-05-24 20:38:25 +02:00
+++ 1.47/mysql-test/r/rpl_000015.result	2007-05-24 20:38:25 +02:00
@@ -13,7 +13,7 @@
 start slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert
-#	127.0.0.1	root	MASTER_PORT	7	master-bin.000001	102	#	#	master-bin.000001	Yes	Yes							0		0	102	#	None		0	No						#	No
+#	127.0.0.1	root	MASTER_PORT	7	master-bin.000001	106	#	#	master-bin.000001	Yes	Yes							0		0	106	#	None		0	No						#	No
 drop table if exists t1;
 create table t1 (n int, PRIMARY KEY(n));
 insert into t1 values (10),(45),(90);
Thread
• bk commit into 5.2 tree (serg:1.2507)	Sergei Golubchik	24 May