database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into genie.(none):/home/hf/work/mysql-5.0.kil
This commit is contained in:
hf@genie.(none)
2003-03-31 13:42:37 +05:00
parent 64552a658d f8f0b70380
commit 0ee0589e93
55 changed files with 110 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_table.cc
View File

@ -2381,7 +2381,7 @@ copy_data_between_tables(TABLE *from,TABLE *to,
{
if (thd->killed)
{
my_error(ER_SERVER_SHUTDOWN,MYF(0));
my_error(thd->killed,MYF(0));
error= 1;
break;
}