Commit 037958bf authored by Alfranio Correia's avatar Alfranio Correia

Post-fix push for BUG#53452.

parent d2210981
This diff is collapsed.
...@@ -674,7 +674,8 @@ const char* Log_event::get_type_str() ...@@ -674,7 +674,8 @@ const char* Log_event::get_type_str()
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT
Log_event::Log_event(THD* thd_arg, uint16 flags_arg, bool using_trans) Log_event::Log_event(THD* thd_arg, uint16 flags_arg, bool using_trans)
:log_pos(0), temp_buf(0), exec_time(0), flags(flags_arg), thd(thd_arg) :log_pos(0), temp_buf(0), exec_time(0), flags(flags_arg),
cache_type(Log_event::EVENT_INVALID_CACHE), thd(thd_arg)
{ {
server_id= thd->server_id; server_id= thd->server_id;
when= thd->start_time; when= thd->start_time;
......
...@@ -4268,6 +4268,7 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table, ...@@ -4268,6 +4268,7 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table,
Alter_info *alter_info) Alter_info *alter_info)
{ {
bool result; bool result;
bool is_trans= FALSE;
DBUG_ENTER("mysql_create_table"); DBUG_ENTER("mysql_create_table");
/* /*
...@@ -4282,7 +4283,6 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table, ...@@ -4282,7 +4283,6 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table,
/* Got lock. */ /* Got lock. */
DEBUG_SYNC(thd, "locked_table_name"); DEBUG_SYNC(thd, "locked_table_name");
bool is_trans;
result= mysql_create_table_no_lock(thd, create_table->db, result= mysql_create_table_no_lock(thd, create_table->db,
create_table->table_name, create_info, create_table->table_name, create_info,
alter_info, FALSE, 0, &is_trans); alter_info, FALSE, 0, &is_trans);
...@@ -4454,6 +4454,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table, ...@@ -4454,6 +4454,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
HA_CREATE_INFO local_create_info; HA_CREATE_INFO local_create_info;
Alter_info local_alter_info; Alter_info local_alter_info;
bool res= TRUE; bool res= TRUE;
bool is_trans= FALSE;
uint not_used; uint not_used;
DBUG_ENTER("mysql_create_like_table"); DBUG_ENTER("mysql_create_like_table");
...@@ -4503,7 +4504,6 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table, ...@@ -4503,7 +4504,6 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
/* Reset auto-increment counter for the new table. */ /* Reset auto-increment counter for the new table. */
local_create_info.auto_increment_value= 0; local_create_info.auto_increment_value= 0;
bool is_trans;
if ((res= mysql_create_table_no_lock(thd, table->db, table->table_name, if ((res= mysql_create_table_no_lock(thd, table->db, table->table_name,
&local_create_info, &local_alter_info, &local_create_info, &local_alter_info,
FALSE, 0, &is_trans))) FALSE, 0, &is_trans)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment