Merge hynda.mysql.fi:/home/my/mysql-5.1-main

into  hynda.mysql.fi:/home/my/mysql-5.1-marvel


client/mysqldump.c:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_yacc.yy:
  Manual merge with 5.1 main tree.

mysql-test/mysql-test-run.pl

@@ -4142,7 +4142,7 @@ sub stop_all_servers () {
   my $pid;
 
   # Start shutdown of all started masters
-  foreach my $mysqld (@{$master}, @{$slave})
+  foreach my $mysqld (@{$slave}, @{$master})
   {
     if ( $mysqld->{'pid'} )
     {

mysql-test/r/ctype_cp932_binlog_stm.result

@@ -41,8 +41,8 @@ BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
 master-bin.000001	783	Query	1	999	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	999	Query	1	1085	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1085	Query	1	1161	use `test`; DROP TABLE t4
+master-bin.000001	999	Query	1	1088	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1088	Query	1	1167	use `test`; DROP TABLE t4
 End of 5.0 tests
 SHOW BINLOG EVENTS FROM 364;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error

mysql-test/r/func_misc.result

@@ -1,3 +1,4 @@
+DROP TABLE IF EXISTS t1;
 select format(1.5555,0),format(123.5555,1),format(1234.5555,2),format(12345.55555,3),format(123456.5555,4),format(1234567.5555,5),format("12345.2399",2);
 format(1.5555,0)	format(123.5555,1)	format(1234.5555,2)	format(12345.55555,3)	format(123456.5555,4)	format(1234567.5555,5)	format("12345.2399",2)
 2	123.6	1,234.56	12,345.556	123,456.5555	1,234,567.55550	12,345.24
@@ -56,7 +57,6 @@ select a from t1 where mid(a+0,6,3) = ( mid(20040106123400,6,3) );
 a
 2004-01-06 12:34:00
 drop table t1;
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (conn CHAR(7), connection_id INT);
 INSERT INTO t1 VALUES ('default', CONNECTION_ID());
 SELECT GET_LOCK('bug16501',600);

mysql-test/r/status.result

@@ -19,8 +19,6 @@ unlock tables;
 show status like 'Table_locks_waited';
 Variable_name	Value
 Table_locks_waited	1
-Immediate
-17
 drop table t1;
 select 1;
 1

mysql-test/suite/ndb/r/ndb_binlog_basic.result

@@ -31,9 +31,6 @@ inserts	updates	deletes
 2	1	1
 flush logs;
 purge master logs before now();
-select count(*) from mysql.ndb_binlog_index;
-count(*)
-0
 create table t1 (a int primary key, b int) engine=ndb;
 create database mysqltest;
 use mysqltest;

mysql-test/suite/ndb/t/ndb_binlog_basic.test

@@ -46,10 +46,18 @@ select inserts,updates,deletes from
 #
 # check that purge clears the ndb_binlog_index
 #
+# TODO: make this deterministic
+# This test is disabled until we can make this determistic under load.
+# The problem is that in some cases, the binlog writing thread gets
+# scheduled after the purge, writes pending things, then the select
+# gets scheduled
+#
 flush logs;
 --sleep 1
 purge master logs before now();
+--disable_parsing
 select count(*) from mysql.ndb_binlog_index;
+--enable_parsing
 
 #
 # several tables in different databases

mysql-test/t/func_misc.test

@@ -2,6 +2,10 @@
 # Testing of misc functions
 #
 
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
 select format(1.5555,0),format(123.5555,1),format(1234.5555,2),format(12345.55555,3),format(123456.5555,4),format(1234567.5555,5),format("12345.2399",2);
 
 select inet_ntoa(inet_aton("255.255.255.255.255.255.255.255"));
@@ -48,9 +52,6 @@ drop table t1;
 #
 # Bug#16501: IS_USED_LOCK does not appear to work
 #
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
 
 CREATE TABLE t1 (conn CHAR(7), connection_id INT);
 INSERT INTO t1 VALUES ('default', CONNECTION_ID());

mysql-test/t/status.test

@@ -59,10 +59,6 @@ connection con1;
 reap;
 # ++Immediate = 16 + $wait_condition_reps
 show status like 'Table_locks_waited';
-# ++Immediate = 17 + $wait_condition_reps
---disable_query_log
-eval select variable_value - $wait_condition_reps as Immediate from information_schema.session_status where variable_name like 'Table_locks_immediate';
---enable_query_log
 drop table t1;
 
 disconnect con2;