1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
This commit is contained in:
serg@serg.mylan
2005-12-05 18:18:56 +01:00
13 changed files with 235 additions and 29 deletions

View File

@ -2617,7 +2617,8 @@ mysql_execute_command(THD *thd)
goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_backup_table(thd, first_table);
(TABLE_LIST*) select_lex->table_list.first=first_table;
lex->query_tables=all_tables;
break;
}
case SQLCOM_RESTORE_TABLE:
@ -2629,6 +2630,8 @@ mysql_execute_command(THD *thd)
goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_restore_table(thd, first_table);
(TABLE_LIST*) select_lex->table_list.first=first_table;
lex->query_tables=all_tables;
break;
}
case SQLCOM_ASSIGN_TO_KEYCACHE:
@ -3131,6 +3134,8 @@ end_with_restore_list:
mysql_bin_log.write(&qinfo);
}
}
(TABLE_LIST*) select_lex->table_list.first=first_table;
lex->query_tables=all_tables;
break;
}
case SQLCOM_CHECK:
@ -3141,6 +3146,8 @@ end_with_restore_list:
goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_check_table(thd, first_table, &lex->check_opt);
(TABLE_LIST*) select_lex->table_list.first=first_table;
lex->query_tables=all_tables;
break;
}
case SQLCOM_ANALYZE:
@ -3161,6 +3168,8 @@ end_with_restore_list:
mysql_bin_log.write(&qinfo);
}
}
(TABLE_LIST*) select_lex->table_list.first=first_table;
lex->query_tables=all_tables;
break;
}
@ -3184,6 +3193,8 @@ end_with_restore_list:
mysql_bin_log.write(&qinfo);
}
}
(TABLE_LIST*) select_lex->table_list.first=first_table;
lex->query_tables=all_tables;
break;
}
case SQLCOM_UPDATE: