diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-13 12:39:34 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-13 12:39:34 +0300 |
| commit | 0948956b802845699f9868b1e2c6b61a74f36b8d (patch) | |
| tree | fa1346a4b858344c1283c7f751d9a97ae77bd9f7 /sql/sql_delete.cc | |
| parent | ab0338a3981143c8aabbaaf99c43f4275df22ad4 (diff) | |
| parent | 3e6215d9d080c8f09499fe2693df085754f97d37 (diff) | |
| download | mariadb-git-0948956b802845699f9868b1e2c6b61a74f36b8d.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index c20a656c547..587b205886e 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -145,8 +145,8 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit, (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) { |