diff options
| author | unknown <monty@donna.mysql.fi> | 2001-03-03 03:03:12 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-03-03 03:03:12 +0200 |
| commit | 73e3499987b138af0bd6ab7df2c69999e2ffbeec (patch) | |
| tree | cd2f65141c35a1998982970704a3f854a987c568 /sql/sql_delete.cc | |
| parent | 3ab1788501f7d967a0260e78230674aaa67ec16e (diff) | |
| download | mariadb-git-73e3499987b138af0bd6ab7df2c69999e2ffbeec.tar.gz | |
Fixes for innobase usage
Fixed bug when using TEXT columns with BDB tables
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
BUILD/compile-pentium:
Added --with-innobase-db
Docs/manual.texi:
Added more documentation to Innobase and KILL
client/mysqladmin.c:
Quote database names for CREATE and DROP
mysql-test/install_test_db.sh:
Don't use innobase, bdb or gemini when installing privilege tables
mysql-test/mysql-test-run.sh:
Added testing of innobase tables
mysql-test/r/bdb.result:
Added test of TEXT column bug
mysql-test/t/bdb.test:
Added test of TEXT column bug
mysql-test/t/innobase.test:
Cleanup innobase tests
scripts/mysql_install_db.sh:
Added testing of innobase tables
sql/field.cc:
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
sql/filesort.cc:
Fixed typo
sql/ha_berkeley.cc:
Fixed problem with TEXT columns in BDB tables
sql/mysqld.cc:
Always support the --innobase-data-file-path option
sql/share/swedish/errmsg.OLD:
Added swedish error messages
sql/share/swedish/errmsg.txt:
Added swedish error messages
sql/sql_base.cc:
Reset tables after usage (to fix problem with BDB and TEXT columns)
sql/sql_delete.cc:
Use generate table if --skip-innobase is used
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 707ff814716..e1196341bef 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -18,6 +18,7 @@ /* Delete of records */ #include "mysql_priv.h" +#include "ha_innobase.h" /* Optimize delete of all rows by doing a full generate of the table @@ -142,9 +143,10 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit, (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) && !(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN))); - /* We need to add code to not generate table based on the table type */ #ifdef HAVE_INNOBASE_DB - use_generate_table=0; + /* 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 #endif if (use_generate_table && ! thd->open_tables) { |