mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Fixed test cases for innobase
Fixed bug introduced with last ORDER BY optimization Changed log position to longlong to avoid warnings. Docs/manual.texi: Update for innobase mysql-test/r/innobase.result: Fixed test cases mysql-test/t/bdb.test: Removed not used tables mysql-test/t/innobase.test: Fixed test cases sql/field.h: Fixed bug introduced with last ORDER BY optimization sql/ha_berkeley.cc: Fixed bug when index_init() was called twice. sql/mysql_priv.h: Added option to not get stack trace (when using gdb) sql/mysqld.cc: Added option to not get stack trace (when using gdb) sql/slave.cc: Changed log position to longlong to avoid warnings. sql/slave.h: Changed log position to longlong to avoid warnings. sql/sql_parse.cc: Removed warnings sql/sql_select.cc: Cleanups
This commit is contained in:
@@ -4451,7 +4451,8 @@ join_init_read_first_with_key(JOIN_TAB *tab)
|
||||
{
|
||||
if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
|
||||
{
|
||||
sql_print_error("read_first_with_key: Got error %d when reading table",error);
|
||||
sql_print_error("read_first_with_key: Got error %d when reading table",
|
||||
error);
|
||||
table->file->print_error(error,MYF(0));
|
||||
return 1;
|
||||
}
|
||||
@@ -4499,7 +4500,7 @@ join_init_read_last_with_key(JOIN_TAB *tab)
|
||||
{
|
||||
if (error != HA_ERR_END_OF_FILE)
|
||||
{
|
||||
sql_print_error("read_first_with_key: Got error %d when reading table",
|
||||
sql_print_error("read_last_with_key: Got error %d when reading table",
|
||||
error, table->path);
|
||||
table->file->print_error(error,MYF(0));
|
||||
return 1;
|
||||
@@ -5176,7 +5177,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit)
|
||||
tab->index=nr;
|
||||
tab->read_first_record= (flag > 0 ? join_init_read_first_with_key:
|
||||
join_init_read_last_with_key);
|
||||
tab->table->file->index_init(tab->index);
|
||||
table->file->index_init(nr);
|
||||
tab->type=JT_NEXT; // Read with index_first(), index_next()
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user