database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0

Browse Source 
into  mysql.com:/usr/home/pem/mysql-5.1-new
This commit is contained in:
pem@mysql.com
2005-12-07 15:17:18 +01:00
parent 771b8c1774 e9e782900f
commit 8e0e421943
15 changed files with 248 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_parse.cc
View File

@@ -2614,7 +2614,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:
@@ -2626,6 +2627,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:
@@ -3119,6 +3122,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:
@@ -3129,6 +3134,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:
@@ -3149,6 +3156,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;
}
@@ -3172,6 +3181,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: