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:
unknown 2001-04-13 21:16:53 +02:00
commit 5128e3750d
105 changed files with 1209 additions and 2162 deletions

View file

@ -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)
{