bk commit into 5.1 tree (tomas:1.2553)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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-04-05 10:21:41+02:00, tomas@stripped +4 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new-maint
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
  MERGE: 1.2534.1.29

  mysql-test/r/information_schema.result@stripped, 2007-04-05 10:21:36+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.147.1.3

  mysql-test/r/rpl_ndb_basic.result@stripped, 2007-04-05 10:21:36+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.5.1.2

  mysql-test/r/rpl_ndb_log.result@stripped, 2007-04-05 10:21:36+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.22.1.1

  sql/mysqld.cc@stripped, 2007-04-05 10:21:36+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.625.1.2

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-single-user/RESYNC

--- 1.627/sql/mysqld.cc	2007-04-04 23:03:22 +02:00
+++ 1.628/sql/mysqld.cc	2007-04-05 10:21:36 +02:00
@@ -7347,6 +7347,18 @@
   /* Allow Win32 and NetWare users to move MySQL anywhere */
   {
     char prg_dev[LIBLEN];
+#if defined __WIN__
+	char executing_path_name[LIBLEN];
+	if (!test_if_hard_path(my_progname))
+	{
+		// we don't want to use GetModuleFileName inside of my_path since
+		// my_path is a generic path dereferencing function and here we care
+		// only about the executing binary.
+		GetModuleFileName(NULL, executing_path_name, sizeof(executing_path_name));
+		my_path(prg_dev, executing_path_name, NULL);
+	}
+	else
+#endif
     my_path(prg_dev,my_progname,"mysql/bin");
     strcat(prg_dev,"/../");			// Remove 'bin' to get base dir
     cleanup_dirname(mysql_home,prg_dev);

--- 1.149/mysql-test/r/information_schema.result	2007-04-04 11:05:06 +02:00
+++ 1.150/mysql-test/r/information_schema.result	2007-04-05 10:21:36 +02:00
@@ -1409,31 +1409,33 @@
 user3148	test
 drop user user3148@localhost;
 DROP TABLE IF EXISTS thread_status;
-CREATE TABLE thread_status (variable_name VARCHAR(64),
-variable_value DECIMAL(22,7));
-CREATE TABLE server_status (variable_name VARCHAR(64),
-variable_value DECIMAL(22,7));
-DROP EVENT IF EXISTS log_status;
-CREATE EVENT log_status
+DROP TABLE IF EXISTS server_status;
+DROP EVENT IF EXISTS event_status;
+SET GLOBAL event_scheduler=1;
+CREATE EVENT event_status
 ON SCHEDULE AT NOW()
-ON COMPLETION PRESERVE
+ON COMPLETION NOT PRESERVE
 DO
 BEGIN
-INSERT INTO thread_status SELECT variable_name, variable_value FROM
-information_schema.session_status;
-INSERT INTO server_status SELECT variable_name, variable_value FROM
-information_schema.global_status;
+CREATE TABLE thread_status
+SELECT variable_name, variable_value
+FROM information_schema.session_status
+WHERE variable_name LIKE 'SSL_ACCEPTS' OR
+variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
+CREATE TABLE server_status
+SELECT variable_name
+FROM information_schema.global_status
+WHERE variable_name LIKE 'ABORTED_CONNECTS' OR
+variable_name LIKE 'BINLOG_CACHE_DISK_USE';
 END$$
-SET GLOBAL event_scheduler=1;
-SELECT * FROM thread_status WHERE variable_name LIKE 'SSL%' LIMIT 1,2;
+SELECT variable_name, variable_value FROM thread_status;
 variable_name	variable_value
 SSL_ACCEPTS	0.0000000
 SSL_CALLBACK_CACHE_HITS	0.0000000
-SELECT variable_name FROM server_status LIMIT 1,2;
+SELECT variable_name FROM server_status;
 variable_name
 ABORTED_CONNECTS
 BINLOG_CACHE_DISK_USE
-DROP EVENT log_status;
 DROP TABLE thread_status;
 DROP TABLE server_status;
 SET GLOBAL event_scheduler=0;

--- 1.23/mysql-test/r/rpl_ndb_log.result	2007-04-02 11:15:07 +02:00
+++ 1.24/mysql-test/r/rpl_ndb_log.result	2007-04-05 10:21:36 +02:00
@@ -99,33 +99,33 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
 slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment
primary key)ENGINE=NDB
-slave-bin.000001	#	Query	2	#	BEGIN
+slave-bin.000001	#	Query	1	#	BEGIN
 slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
 slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)
 slave-bin.000001	#	Write_rows	2	#	table_id: #
-slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	2	#	COMMIT
+slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	1	#	COMMIT
 slave-bin.000001	#	Query	1	#	use `test`; drop table t1
 slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not
null)ENGINE=NDB
-slave-bin.000001	#	Query	2	#	BEGIN
+slave-bin.000001	#	Query	1	#	BEGIN
 slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
 slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)
 slave-bin.000001	#	Write_rows	2	#	table_id: #
-slave-bin.000001	#	Write_rows	2	#	table_id: #
-slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	2	#	COMMIT
+slave-bin.000001	#	Write_rows	1	#	table_id: #
+slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	1	#	COMMIT
 slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB
 slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
 slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB
-slave-bin.000002	#	Query	2	#	BEGIN
+slave-bin.000002	#	Query	1	#	BEGIN
 slave-bin.000002	#	Table_map	2	#	table_id: # (test.t2)
 slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)
 slave-bin.000002	#	Write_rows	2	#	table_id: #
-slave-bin.000002	#	Write_rows	2	#	table_id: # flags: STMT_END_F
-slave-bin.000002	#	Query	2	#	COMMIT
+slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F
+slave-bin.000002	#	Query	1	#	COMMIT
 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	1	master-bin.000002	617	#	#	master-bin.000002	Yes	Yes				#			0		0	617	#	None		0	No						#	No

--- 1.7/mysql-test/r/rpl_ndb_basic.result	2007-04-03 07:21:37 +02:00
+++ 1.8/mysql-test/r/rpl_ndb_basic.result	2007-04-05 10:21:36 +02:00
@@ -147,6 +147,7 @@
 Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	<Seconds_Behind_Master>
+Master_SSL_Verify_Server_Cert	No
 set GLOBAL slave_transaction_retries=10;
 START SLAVE;
 select * from t1 order by nid;