mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- Fixed that Aria works with HANDLER commands
- Added test case for Aria - Tested HANDLER with HEAP (changes to HEAP code will be pushed in 5.3) - Moved all HANDLER test to suite/handler. mysql-test/Makefile.am: Added suite/handler mysql-test/mysql-test-run.pl: Added suite/handler mysql-test/r/lock_multi.result: Remove test that is already in handler test suite mysql-test/suite/handler/aria.result: Test for HANDLER with Aria storage engine mysql-test/suite/handler/aria.test: Test for HANDLER with Aria storage engine mysql-test/suite/handler/handler.inc: Extended the general handler test Moved interface testing to 'interface.test' mysql-test/suite/handler/init.inc: Common init for handler tests. mysql-test/suite/handler/innodb.result: New results mysql-test/suite/handler/innodb.test: Update to use new include files mysql-test/suite/handler/interface.result: Test of HANDLER interface (not storage engine dependent parts) mysql-test/suite/handler/interface.test: Test of HANDLER interface (not storage engine dependent parts) mysql-test/suite/handler/myisam.result: New results mysql-test/suite/handler/myisam.test: Update to use new include files mysql-test/t/lock_multi.test: Remove test that is already in handler test suite mysys/tree.c: Added missing handling of read previous (showed up in HEAP testing) sql/handler.cc: Don't marka 'HA_ERR_RECORD_CHANGED' as fatal (can be used with HANDLER READ, especially with MEMORY ENGINE) sql/handler.h: Added prototype for can_continue_handler_scan() sql/sql_handler.cc: Re-initialize search if we switch from key to table search. Check if handler can continue searching between calls (via can_continue_handler_scan()) Don't write common not fatal errors to log storage/maria/ma_extra.c: Don't set index 0 as default. This forces call to ma_check_index() to set up index variables. storage/maria/ma_ft_boolean_search.c: Ensure that info->last_key.keyinfo is set storage/maria/ma_open.c: Don't set index 0 as default. This forces call to ma_check_index() to set up index variables. storage/maria/ma_rkey.c: Trivial optimization storage/maria/ma_rnext.c: Added missing code from mi_rnext.c to ensure that handler next/prev works. storage/maria/ma_rsame.c: Simple optimizations storage/maria/ma_search.c: Initialize info->last_key once and for all when we change keys. storage/maria/ma_unique.c: Ensure that info->last_key.keyinfo is up to date.
This commit is contained in:
@@ -548,6 +548,12 @@ retry:
|
||||
mode= RLAST;
|
||||
}
|
||||
}
|
||||
else if (table->file->inited != handler::RND)
|
||||
{
|
||||
/* Convert RNEXT to RFIRST if we haven't started row scan */
|
||||
if (mode == RNEXT)
|
||||
mode= RFIRST;
|
||||
}
|
||||
|
||||
if (insert_fields(thd, &thd->lex->select_lex.context,
|
||||
tables->db, tables->alias, &it, 0))
|
||||
@@ -569,6 +575,8 @@ retry:
|
||||
case RNEXT:
|
||||
if (table->file->inited != handler::NONE)
|
||||
{
|
||||
if ((error= table->file->can_continue_handler_scan()))
|
||||
break;
|
||||
if (keyname)
|
||||
{
|
||||
/* Check if we read from the same index. */
|
||||
@@ -603,6 +611,8 @@ retry:
|
||||
DBUG_ASSERT((uint) keyno == table->file->get_index());
|
||||
if (table->file->inited != handler::NONE)
|
||||
{
|
||||
if ((error= table->file->can_continue_handler_scan()))
|
||||
break;
|
||||
error=table->file->index_prev(table->record[0]);
|
||||
break;
|
||||
}
|
||||
@@ -673,8 +683,11 @@ retry:
|
||||
continue;
|
||||
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'",
|
||||
error, tables->table_name);
|
||||
/* Don't give error in the log file for some expected problems */
|
||||
if (error != HA_ERR_RECORD_CHANGED && error != HA_ERR_WRONG_COMMAND)
|
||||
sql_print_error("mysql_ha_read: Got error %d when reading "
|
||||
"table '%s'",
|
||||
error, tables->table_name);
|
||||
table->file->print_error(error,MYF(0));
|
||||
goto err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user