Skip to content

M
MariaDB
Commit 5517b5d4 authored by konstantin@mysql.com's avatar konstantin@mysql.com
Browse files
Options

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

into  mysql.com:/opt/local/work/mysql-5.0-root
parents 5b981a48 7bb7006d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
sql/sql_parse.cc
View file @ 5517b5d4
...@@ -2617,7 +2617,7 @@ mysql_execute_command(THD *thd) ...@@ -2617,7 +2617,7 @@ mysql_execute_command(THD *thd)
goto error; /* purecov: inspected */ goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements; thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_backup_table(thd, first_table); res = mysql_backup_table(thd, first_table);
(TABLE_LIST*) select_lex->table_list.first=first_table; select_lex->table_list.first= (byte*) first_table;
lex->query_tables=all_tables; lex->query_tables=all_tables;
break; break;
} }
...@@ -2630,7 +2630,7 @@ mysql_execute_command(THD *thd) ...@@ -2630,7 +2630,7 @@ mysql_execute_command(THD *thd)
goto error; /* purecov: inspected */ goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements; thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_restore_table(thd, first_table); res = mysql_restore_table(thd, first_table);
(TABLE_LIST*) select_lex->table_list.first=first_table; select_lex->table_list.first= (byte*) first_table;
lex->query_tables=all_tables; lex->query_tables=all_tables;
break; break;
} }
...@@ -3134,7 +3134,7 @@ mysql_execute_command(THD *thd) ...@@ -3134,7 +3134,7 @@ mysql_execute_command(THD *thd)
mysql_bin_log.write(&qinfo); mysql_bin_log.write(&qinfo);
} }
} }
(TABLE_LIST*) select_lex->table_list.first=first_table; select_lex->table_list.first= (byte*) first_table;
lex->query_tables=all_tables; lex->query_tables=all_tables;
break; break;
} }
...@@ -3146,7 +3146,7 @@ mysql_execute_command(THD *thd) ...@@ -3146,7 +3146,7 @@ mysql_execute_command(THD *thd)
goto error; /* purecov: inspected */ goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements; thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_check_table(thd, first_table, &lex->check_opt); res = mysql_check_table(thd, first_table, &lex->check_opt);
(TABLE_LIST*) select_lex->table_list.first=first_table; select_lex->table_list.first= (byte*) first_table;
lex->query_tables=all_tables; lex->query_tables=all_tables;
break; break;
} }
...@@ -3168,7 +3168,7 @@ mysql_execute_command(THD *thd) ...@@ -3168,7 +3168,7 @@ mysql_execute_command(THD *thd)
mysql_bin_log.write(&qinfo); mysql_bin_log.write(&qinfo);
} }
} }
(TABLE_LIST*) select_lex->table_list.first=first_table; select_lex->table_list.first= (byte*) first_table;
lex->query_tables=all_tables; lex->query_tables=all_tables;
break; break;
} }
...@@ -3193,7 +3193,7 @@ mysql_execute_command(THD *thd) ...@@ -3193,7 +3193,7 @@ mysql_execute_command(THD *thd)
mysql_bin_log.write(&qinfo); mysql_bin_log.write(&qinfo);
} }
} }
(TABLE_LIST*) select_lex->table_list.first=first_table; select_lex->table_list.first= (byte*) first_table;
lex->query_tables=all_tables; lex->query_tables=all_tables;
break; break;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7