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*)
This commit is contained in:
parent
8c5ae25ff5
commit
8532fa29f4
@ -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)
|
|||||||
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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user