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

Merge with mysql-maria tree

Browse Source 
mysql-test/t/variables.test:
  Reset delay_key_write, otherwise maria.maria test may fail
sql/set_var.cc:
  Reset ha_open_options if one resets the delay_key_write variable.
  Before there was no way to reset it without restarting mysqld, which caused some tests to fail
This commit is contained in:
Michael Widenius
2009-02-19 11:01:25 +02:00
parent 8526274c21 6a1bc662d6
commit 945fa0d913
342 changed files with 4300 additions and 1944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_table.cc
View File

@ -4992,6 +4992,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
dst_path); /* purecov: inspected */
goto err; /* purecov: inspected */
}
thd->thread_specific_used= TRUE;
}
else if (err)
{
@ -7174,7 +7175,9 @@ err_with_placeholders:
VOID(pthread_mutex_unlock(&LOCK_open));
DBUG_RETURN(TRUE);
}
/* mysql_alter_table */
/* Copy all rows from one table to another */
static int
copy_data_between_tables(TABLE *from,TABLE *to,
@ -7188,7 +7191,7 @@ copy_data_between_tables(TABLE *from,TABLE *to,
{
int error= 1, errpos= 0;
Copy_field *copy= NULL, *copy_end;
ulong found_count= 0, delete_count= 0;
ha_rows found_count= 0, delete_count= 0;
THD *thd= current_thd;
uint length= 0;
SORT_FIELD *sortorder;