mirror of
https://github.com/MariaDB/server.git
synced 2026-05-05 06:35:33 +02:00
merged
BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged acinclude.m4: Auto merged configure.in: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/sql_delete.cc: Auto merged
This commit is contained in:
commit
5128e3750d
105 changed files with 1209 additions and 2162 deletions
|
|
@ -150,8 +150,8 @@ int mysql_delete(THD *thd,
|
|||
(OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN)));
|
||||
#ifdef HAVE_INNOBASE_DB
|
||||
/* We need to add code to not generate table based on the table type */
|
||||
if (!innobase_skip)
|
||||
use_generate_table=0; // Innobase can't use re-generate table
|
||||
if (!innodb_skip)
|
||||
use_generate_table=0; // Innodb can't use re-generate table
|
||||
#endif
|
||||
if (use_generate_table && ! thd->open_tables)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue