Commit a88f5e40 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
parents 035974b8 6846f62c

mysql-test/r/rpl_multi_query.result

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ n 
3

4

5

show binlog events from 95;

show binlog events from 96;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	drop database if exists mysqltest

master-bin.000001	#	Query	1	#	create database mysqltest

mysql-test/t/rpl_multi_query.test

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ sync_slave_with_master; 
select * from mysqltest.t1;

connection master;

--replace_column 2 # 5 #

show binlog events from 95;

show binlog events from 96;

drop database mysqltest;

sync_slave_with_master;

sql/ha_federated.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class ha_federated: public handler 
      return errorcode otherwise

  */

  uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row);

  bool ha_federated::create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length); 

  bool create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length); 



public:

  ha_federated(TABLE *table): handler(table),

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -5151,8 +5151,8 @@ void mysql_parse(THD *thd, char *inBuf, uint length) 
            PROCESSLIST.

            Note that we don't need LOCK_thread_count to modify query_length.

          */

          if (lex->found_colon &&

              (thd->query_length= (ulong)(lex->found_colon - thd->query)))

          if (lex->found_semicolon &&

              (thd->query_length= (ulong)(lex->found_semicolon - thd->query)))

            thd->query_length--;

          /* Actually execute the query */

	  mysql_execute_command(thd);