bk commit into 5.1 tree (jani:1.2571)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani 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-10 18:01:29+03:00, jani@stripped +5 -0
  Small fixes for merge.

  mysql-test/include/not_embedded.inc@stripped, 2007-04-10 18:01:26+03:00, jani@stripped +1 -1
    Fixed a typo.

  mysql-test/lib/mtr_cases.pl@stripped, 2007-04-10 18:01:26+03:00, jani@stripped +2 -2
    Fixed typo and wrong error message.

  mysql-test/r/binlog_statement_insert_delayed.result@stripped, 2007-04-10 18:01:26+03:00, jani@stripped +6 -6
    Fixed result file.

  sql/event_db_repository.cc@stripped, 2007-04-10 18:01:26+03:00, jani@stripped +1 -1
    Fixed type.

  sql/log.cc@stripped, 2007-04-10 18:01:26+03:00, jani@stripped +1 -1
    Fixed type.

# 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:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.1-marvel

--- 1.276/sql/log.cc	2007-04-10 18:01:38 +03:00
+++ 1.277/sql/log.cc	2007-04-10 18:01:38 +03:00
@@ -574,7 +574,7 @@
       lock_time may be truncated without warning here, if greater than
       839 hours (~35 days)
     */
-    TIME t;
+    MYSQL_TIME t;
     t.neg= 0;
 
     /* fill in query_time field */

--- 1.4/mysql-test/r/binlog_statement_insert_delayed.result	2007-04-10 18:01:38 +03:00
+++ 1.5/mysql-test/r/binlog_statement_insert_delayed.result	2007-04-10 18:01:38 +03:00
@@ -3,13 +3,13 @@
 insert delayed into t1 values (207);
 insert delayed into t1 values (null);
 insert delayed into t1 values (300);
-show binlog events from 102;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
-master-bin.000001	#	Query	1	#	use `test`; insert delayed into t1 values (207)
-master-bin.000001	#	Intvar	1	#	INSERT_ID=208
-master-bin.000001	#	Query	1	#	use `test`; insert delayed into t1 values (null)
-master-bin.000001	#	Query	1	#	use `test`; insert delayed into t1 values (300)
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
+master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (207)
+master-bin.000001	#	Intvar	#	#	INSERT_ID=208
+master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (null)
+master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (300)
 insert delayed into t1 values (null),(null),(null),(null);
 insert delayed into t1 values (null),(null),(400),(null);
 11 == 11

--- 1.28/sql/event_db_repository.cc	2007-04-10 18:01:38 +03:00
+++ 1.29/sql/event_db_repository.cc	2007-04-10 18:01:38 +03:00
@@ -940,7 +940,7 @@
 
   if (update_last_executed)
   {
-    TIME time;
+    MYSQL_TIME time;
     my_tz_UTC->gmt_sec_to_TIME(&time, last_executed);
 
     fields[ET_FIELD_LAST_EXECUTED]->set_notnull();

--- 1.55/mysql-test/lib/mtr_cases.pl	2007-04-10 18:01:38 +03:00
+++ 1.56/mysql-test/lib/mtr_cases.pl	2007-04-10 18:01:38 +03:00
@@ -534,7 +534,7 @@
 	 ! ( $tinfo->{'binlog_format'} eq $::used_binlog_format ) )
     {
       $tinfo->{'skip'}= 1;
-      $tinfo->{'comment'}= "Not running with binlog format '$tinfo->{'binlog_format'}'";
+      $tinfo->{'comment'}= "Requiring binlog format '$tinfo->{'binlog_format'}'";
       return;
     }
 
@@ -599,7 +599,7 @@
 (
  ["include/have_innodb.inc", "innodb_test", 1],
  ["include/have_binlog_format_row.inc", "binlog_format", "row"],
- ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"],
+ ["include/have_binlog_format_statement.inc", "binlog_format", "statement"],
  ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],
  ["include/big_test.inc", "big_test", 1],
  ["include/have_debug.inc", "need_debug", 1],

--- 1.5/mysql-test/include/not_embedded.inc	2007-04-10 18:01:38 +03:00
+++ 1.6/mysql-test/include/not_embedded.inc	2007-04-10 18:01:38 +03:00
@@ -1,5 +1,5 @@
 -- require r/not_embedded.require
 disable_query_log;
-select version() like N'%embedded%' as 'have_embedded';
+select version() like '%embedded%' as 'have_embedded';
 enable_query_log;