mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-03 13:45:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

mysql-5.5.29 merge

Browse source
This commit is contained in:
Sergei Golubchik 2013-01-15 19:13:32 +01:00
commit d3935adf7a
94 changed files with 4301 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sql/event_db_repository.cc
View file

@ -409,7 +409,6 @@ Event_db_repository::index_read_for_db_for_i_s(THD *thd, TABLE *schema_table,
TABLE *event_table,
const char *db)
{
int ret=0;
CHARSET_INFO *scs= system_charset_info;
KEY *key_info;
uint key_len;
@ -419,7 +418,14 @@ Event_db_repository::index_read_for_db_for_i_s(THD *thd, TABLE *schema_table,
DBUG_ENTER("Event_db_repository::index_read_for_db_for_i_s");
DBUG_PRINT("info", ("Using prefix scanning on PK"));
event_table->file->ha_index_init(0, 1);
int ret= event_table->file->ha_index_init(0, 1);
if (ret)
{
event_table->file->print_error(ret, MYF(0));
DBUG_RETURN(true);
}
key_info= event_table->key_info;
if (key_info->key_parts == 0 ||