diff options
| author | unknown <serg@serg.mylan> | 2003-10-11 13:06:55 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-11 13:06:55 +0200 |
| commit | 2e1115edc1b5899975c33b4367256ce650d3a0f4 (patch) | |
| tree | ff3da12e7e88d561877cd7b6f3fe64edad0c10c0 /sql/sql_delete.cc | |
| parent | 7154615de30122f4dcf719b11fcbc32563ff11d2 (diff) | |
| download | mariadb-git-2e1115edc1b5899975c33b4367256ce650d3a0f4.tar.gz | |
key_map with more that 64 bits width
sql/field.cc:
typedef Bitmap<64> key_map
all tests pass
sql/ha_berkeley.cc:
typedef Bitmap<64> key_map
all tests pass
sql/ha_berkeley.h:
typedef Bitmap<64> key_map
all tests pass
sql/item.cc:
typedef Bitmap<64> key_map
all tests pass
sql/item_func.cc:
typedef Bitmap<64> key_map
all tests pass
sql/opt_sum.cc:
typedef Bitmap<64> key_map
all tests pass
sql/sql_delete.cc:
typedef Bitmap<64> key_map
all tests pass
sql/sql_show.cc:
typedef Bitmap<64> key_map
all tests pass
sql/sql_test.cc:
typedef Bitmap<64> key_map
all tests pass
sql/sql_update.cc:
typedef Bitmap<64> key_map
all tests pass
include/my_bitmap.h:
more bitmap methods
mysys/my_bitmap.c:
more bitmap methods
sql/field.h:
init bitmaps
sql/ha_innodb.h:
optimization
sql/ha_isam.cc:
optimization
sql/ha_myisam.cc:
optimization
sql/ha_myisammrg.cc:
optimization
sql/handler.h:
optimization
sql/mysqld.cc:
bitmap_init() interface changed
sql/opt_range.cc:
optimization
sql/opt_range.h:
optimization
sql/slave.cc:
bitmap_init() interface changed
sql/sql_base.cc:
optimization
sql/sql_select.cc:
init bitmaps
using const for bitmaps whenever possible
sql/sql_select.h:
cleanup
sql/table.cc:
always init bitmaps
BitKeeper/etc/ignore:
Added sql/udf_example.so to the ignore list
sql/mysql_priv.h:
use Bitmap over ulonglong by default
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 48ef5b4b74c..bd76cbd5f36 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -85,7 +85,8 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, /* Handler didn't support fast delete; Delete rows one by one */ } - table->used_keys=table->quick_keys=0; // Can't use 'only index' + table->used_keys.clear_all(); + table->quick_keys.clear_all(); // Can't use 'only index' select=make_select(table,0,0,conds,&error); if (error) DBUG_RETURN(-1); @@ -98,7 +99,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, } /* If running in safe sql mode, don't allow updates without keys */ - if (!table->quick_keys) + if (table->quick_keys.is_clear_all()) { thd->lex.select_lex.options|=QUERY_NO_INDEX_USED; if (safe_update && !using_limit) @@ -292,7 +293,7 @@ multi_delete::initialize_tables(JOIN *join) walk=walk->next; /* Don't use KEYREAD optimization on this table */ tbl->no_keyread=1; - tbl->used_keys= 0; + tbl->used_keys.clear_all(); if (tbl->file->has_transactions()) log_delayed= transactional_tables= 1; else if (tbl->tmp_table != NO_TMP_TABLE) |