diff options
| author | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
| commit | 47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50 (patch) | |
| tree | 85bce6df7d0ce9d809ff3fc13fa4486590463d00 /sql/sql_handler.cc | |
| parent | afbe601302fc59c498437321b296ed6c8d360564 (diff) | |
| download | mariadb-git-47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50.tar.gz | |
Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 61e57362bd4..edb895fd24a 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -288,7 +288,6 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables) { (*table_ptr)->file->ha_index_or_rnd_end(); VOID(pthread_mutex_lock(&LOCK_open)); - table->file->ha_index_or_rnd_end(); if (close_thread_table(thd, table_ptr)) { /* Tell threads waiting for refresh that something has happened */ @@ -532,11 +531,11 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, { if (error == HA_ERR_RECORD_DELETED) continue; - if (err != HA_ERR_KEY_NOT_FOUND && err != HA_ERR_END_OF_FILE) + if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE) { sql_print_error("mysql_ha_read: Got error %d when reading table '%s'", - err, tables->real_name); - table->file->print_error(err,MYF(0)); + error, tables->real_name); + table->file->print_error(error,MYF(0)); goto err; } goto ok; |