database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Fixes for innobase usage

Browse Source 
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
This commit is contained in:
unknown
2001-03-03 03:03:12 +02:00
parent 3ab1788501
commit 73e3499987
17 changed files with 471 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_delete.cc
View File

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