Commit 8532fa29 authored by pem@mysql.com's avatar pem@mysql.com

Post-push fix for BUG#18344: DROP DATABASE does not drop associated routines

Fixed windows compile error in sql/sp.cc (missing cast to byte*)
parent 8c5ae25f
...@@ -901,7 +901,7 @@ sp_drop_db_routines(THD *thd, char *db) ...@@ -901,7 +901,7 @@ sp_drop_db_routines(THD *thd, char *db)
ret= SP_OK; ret= SP_OK;
table->file->ha_index_init(0); table->file->ha_index_init(0);
if (! table->file->index_read(table->record[0], if (! table->file->index_read(table->record[0],
table->field[MYSQL_PROC_FIELD_DB]->ptr, (byte *)table->field[MYSQL_PROC_FIELD_DB]->ptr,
key_len, HA_READ_KEY_EXACT)) key_len, HA_READ_KEY_EXACT))
{ {
int nxtres; int nxtres;
...@@ -918,7 +918,7 @@ sp_drop_db_routines(THD *thd, char *db) ...@@ -918,7 +918,7 @@ sp_drop_db_routines(THD *thd, char *db)
break; break;
} }
} while (! (nxtres= table->file->index_next_same(table->record[0], } while (! (nxtres= table->file->index_next_same(table->record[0],
table->field[MYSQL_PROC_FIELD_DB]->ptr, (byte *)table->field[MYSQL_PROC_FIELD_DB]->ptr,
key_len))); key_len)));
if (nxtres != HA_ERR_END_OF_FILE) if (nxtres != HA_ERR_END_OF_FILE)
ret= SP_KEY_NOT_FOUND; ret= SP_KEY_NOT_FOUND;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment