diff options
| author | rafal@quant.(none) <> | 2007-08-27 14:01:19 +0200 |
|---|---|---|
| committer | rafal@quant.(none) <> | 2007-08-27 14:01:19 +0200 |
| commit | fedc0a3ca8d13f49ed70f6537bd3c9b70f6a4998 (patch) | |
| tree | 4a3c54f9e841d93b2ba708aa041f2081682b5f7b /sql/sp.cc | |
| parent | 3500810898ea7680923122128fc55c76cac3a2b9 (diff) | |
| parent | f8b64e17f94923ef421469d648c31c0f06d2cf96 (diff) | |
| download | mariadb-git-fedc0a3ca8d13f49ed70f6537bd3c9b70f6a4998.tar.gz | |
Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22
into quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-rpl
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 372aa9c6780..0956561719b 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -97,7 +97,8 @@ public: protected: virtual Object_creation_ctx *create_backup_ctx(THD *thd) const { - return new Stored_routine_creation_ctx(thd); + DBUG_ENTER("Stored_routine_creation_ctx::create_backup_ctx"); + DBUG_RETURN(new Stored_routine_creation_ctx(thd)); } private: @@ -348,8 +349,8 @@ 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, HA_WHOLE_KEY, - HA_READ_KEY_EXACT)) + if (table->file->index_read_idx_map(table->record[0], 0, key, HA_WHOLE_KEY, + HA_READ_KEY_EXACT)) DBUG_RETURN(SP_KEY_NOT_FOUND); DBUG_RETURN(SP_OK); @@ -1182,9 +1183,9 @@ sp_drop_db_routines(THD *thd, char *db) ret= SP_OK; table->file->ha_index_init(0, 1); - if (! table->file->index_read(table->record[0], - (uchar *)table->field[MYSQL_PROC_FIELD_DB]->ptr, - (key_part_map)1, HA_READ_KEY_EXACT)) + if (! table->file->index_read_map(table->record[0], + (uchar *)table->field[MYSQL_PROC_FIELD_DB]->ptr, + (key_part_map)1, HA_READ_KEY_EXACT)) { int nxtres; bool deleted= FALSE; |