diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-01-16 23:02:26 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-01-16 23:02:26 +0200 |
| commit | 088582035efe96857e6453a72443ae1d8049fc3a (patch) | |
| tree | 018279aec359563ce57663242828891f44489682 /sql/sql_update.cc | |
| parent | 40c146f6a22e7397d9e5d1880b29f2c88fb39eda (diff) | |
| download | mariadb-git-088582035efe96857e6453a72443ae1d8049fc3a.tar.gz | |
Move HA_EXTRA_NO_READCHECK to ha_open
Fixed bug in multi-table-delete
Docs/manual.texi:
Changelog
include/mysql_com.h:
Define MAX_CHAR_WIDTH
myisam/mi_extra.c:
Cleanup
mysql-test/r/bdb.result:
Bug test
mysql-test/r/group_by.result:
Bug test
mysql-test/t/bdb.test:
Bug test
mysql-test/t/group_by.test:
Bug test
sql/ha_berkeley.cc:
More debug statements
sql/handler.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/records.cc:
More DBUG statements
sql/sql_analyse.cc:
Cleanup
sql/sql_base.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/sql_delete.cc:
Fixed bug in multi-table-delete
Cleanup
sql/sql_select.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/sql_update.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index b9cf7478e0c..4f2bca88ce0 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -257,8 +257,6 @@ int mysql_update(THD *thd, } } - if (!(test_flags & TEST_READCHECK)) /* For debugging */ - VOID(table->file->extra(HA_EXTRA_NO_READCHECK)); if (handle_duplicates == DUP_IGNORE) table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); init_read_record(&info,thd,table,select,0,1); @@ -303,7 +301,6 @@ int mysql_update(THD *thd, } end_read_record(&info); thd->proc_info="end"; - VOID(table->file->extra(HA_EXTRA_READCHECK)); VOID(table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY)); table->time_stamp=save_time_stamp; // Restore auto timestamp pointer using_transactions=table->file->has_transactions(); @@ -362,7 +359,6 @@ multi_update::multi_update(THD *thd_arg, TABLE_LIST *ut, List<Item> &fs, for (TABLE_LIST *dt=ut ; dt ; dt=dt->next,counter++) { TABLE *table=ut->table; - (void) ut->table->file->extra(HA_EXTRA_NO_READCHECK); (void) ut->table->file->extra(HA_EXTRA_NO_KEYREAD); dt->table->used_keys=0; if (table->timestamp_field) @@ -521,14 +517,12 @@ multi_update::initialize_tables(JOIN *join) multi_update::~multi_update() { - /* Add back EXTRA_READCHECK; In 4.0.1 we shouldn't need this anymore */ int counter = 0; for (table_being_updated=update_tables ; table_being_updated ; counter++, table_being_updated=table_being_updated->next) { TABLE *table=table_being_updated->table; - (void)table->file->extra(HA_EXTRA_READCHECK); if (error) table->time_stamp=save_time_stamps[counter]; } |