diff options
| author | unknown <serg@janus.mylan> | 2007-01-29 10:40:26 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-01-29 10:40:26 +0100 |
| commit | 4e8b49d656828fbe2f84d9970a036db644185981 (patch) | |
| tree | f14bd08181ddd81d2a41f06d9bf0f11d6edf53b5 /sql/sp.cc | |
| parent | 6e1ba88418887369ca71b49222c6fd66335bbe0c (diff) | |
| download | mariadb-git-4e8b49d656828fbe2f84d9970a036db644185981.tar.gz | |
WL#3700: Handler API change: all index search methods - that is,
index_read(), index_read_idx(), index_read_last(), and
records_in_range() - instead of 'uint keylen' argument take
'ulonglong keypart_map', a bitmap showing which keyparts are
present in the key value.
Fallback method is provided for handlers that are lagging behind.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 14703e3aa42..19195a4f043 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -218,8 +218,7 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, TABLE *table) key_copy(key, table->record[0], table->key_info, table->key_info->key_length); - if (table->file->index_read_idx(table->record[0], 0, - key, table->key_info->key_length, + if (table->file->index_read_idx(table->record[0], 0, key, ~ULL(0), HA_READ_KEY_EXACT)) DBUG_RETURN(SP_KEY_NOT_FOUND); @@ -494,8 +493,6 @@ db_create_routine(THD *thd, int type, sp_head *sp) int ret; TABLE *table; char definer[USER_HOST_BUFF_SIZE]; - char old_db_buf[NAME_LEN+1]; - LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) }; DBUG_ENTER("db_create_routine"); DBUG_PRINT("enter", ("type: %d name: %.*s",type,sp->m_name.length, sp->m_name.str)); @@ -906,7 +903,7 @@ sp_drop_db_routines(THD *thd, char *db) table->file->ha_index_init(0, 1); if (! table->file->index_read(table->record[0], (byte *)table->field[MYSQL_PROC_FIELD_DB]->ptr, - key_len, HA_READ_KEY_EXACT)) + (ulonglong)1, HA_READ_KEY_EXACT)) { int nxtres; bool deleted= FALSE; |