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 with mariaDB 5.5.23: bzr merge lp:maria/5.5

Browse Source
This commit is contained in:
Seppo Jaakola
2012-04-26 13:59:35 +03:00
parent f96fd3f40f b6ad03cde9
commit e001516351
621 changed files with 14792 additions and 4405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.cc
View File

@ -145,9 +145,9 @@ Key::Key(const Key &rhs, MEM_ROOT *mem_root)
*/
Foreign_key::Foreign_key(const Foreign_key &rhs, MEM_ROOT *mem_root)
:Key(rhs),
:Key(rhs,mem_root),
ref_table(rhs.ref_table),
ref_columns(rhs.ref_columns),
ref_columns(rhs.ref_columns,mem_root),
delete_opt(rhs.delete_opt),
update_opt(rhs.update_opt),
match_opt(rhs.match_opt)
@ -3930,6 +3930,9 @@ void THD::restore_backup_open_tables_state(Open_tables_backup *backup)
extern "C" int thd_killed(const MYSQL_THD thd)
{
if (!thd)
thd= current_thd;
if (!(thd->killed & KILL_HARD_BIT))
return 0;
return thd->killed;