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

references lp:1011983

Browse Source 
Merged latest MariaDB development in: bzr merge lp:maria/5.5
=> 
Text conflict in CMakeLists.txt
Text conflict in sql/handler.h
Text conflict in support-files/CMakeLists.txt
3 conflicts
This commit is contained in:
Seppo Jaakola
2012-06-12 16:34:18 +03:00
parent 33ffe0dd29 9892ace475
commit b96af9a3ab
512 changed files with 5116 additions and 5794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_trigger.cc
View File

@ -561,7 +561,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
if (result)
goto end;
close_all_tables_for_name(thd, table->s, FALSE);
close_all_tables_for_name(thd, table->s, HA_EXTRA_NOT_USED);
/*
Reopen the table if we were under LOCK TABLES.
Ignore the return value for now. It's better to