summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpem@mysql.com <>2006-04-21 14:30:44 +0200
committerpem@mysql.com <>2006-04-21 14:30:44 +0200
commit8532fa29f46b02dcfff72b3138720d2c8892125e (patch)
tree56ba74d9c524530a00399da837d73f08f91187ec
parent8c5ae25ff538ffc0bbb5f55019365773997dd286 (diff)
downloadmariadb-git-8532fa29f46b02dcfff72b3138720d2c8892125e.tar.gz
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*)
-rw-r--r--sql/sp.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc
index ab391e531eb..7df22c92cb8 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -901,7 +901,7 @@ sp_drop_db_routines(THD *thd, char *db)
ret= SP_OK;
table->file->ha_index_init(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))
{
int nxtres;
@@ -918,7 +918,7 @@ sp_drop_db_routines(THD *thd, char *db)
break;
}
} 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)));
if (nxtres != HA_ERR_END_OF_FILE)
ret= SP_KEY_NOT_FOUND;