From 2033175ad01f956108fa2e88a69be5c8e4cc1b9c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Feb 2005 14:42:14 +0100 Subject: [PATCH 1/2] compilation fixes sql/ha_federated.h: copy-paste fix sql/sql_parse.cc: after-merge fix --- sql/ha_federated.h | 2 +- sql/sql_parse.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/ha_federated.h b/sql/ha_federated.h index 56f5e6de4b7..75f2c227d45 100755 --- a/sql/ha_federated.h +++ b/sql/ha_federated.h @@ -72,7 +72,7 @@ private: 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), diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 84c82035326..8a5933f09a2 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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); From 6846f62c683bfdc4136ae8cbbb0e8a3ac268fc38 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Feb 2005 14:53:23 +0100 Subject: [PATCH 2/2] after-merge fix --- mysql-test/r/rpl_multi_query.result | 2 +- mysql-test/t/rpl_multi_query.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/rpl_multi_query.result b/mysql-test/r/rpl_multi_query.result index 0c80d71d271..e5883ac9299 100644 --- a/mysql-test/r/rpl_multi_query.result +++ b/mysql-test/r/rpl_multi_query.result @@ -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 diff --git a/mysql-test/t/rpl_multi_query.test b/mysql-test/t/rpl_multi_query.test index 80bdfb521eb..fbe6d8057f5 100644 --- a/mysql-test/t/rpl_multi_query.test +++ b/mysql-test/t/rpl_multi_query.test @@ -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;