Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
This commit is contained in:
commit
cdb7e5926c
@ -2208,10 +2208,11 @@ row_drop_database_for_mysql(
|
||||
dict_table_t* table;
|
||||
char* table_name;
|
||||
int err = DB_SUCCESS;
|
||||
ulint namelen = strlen(name);
|
||||
|
||||
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
||||
ut_a(name != NULL);
|
||||
ut_a(name[strlen(name) - 1] == '/');
|
||||
ut_a(name[namelen - 1] == '/');
|
||||
|
||||
trx->op_info = (char *) "dropping database";
|
||||
|
||||
@ -2220,7 +2221,7 @@ loop:
|
||||
row_mysql_lock_data_dictionary(trx);
|
||||
|
||||
while ((table_name = dict_get_first_table_name_in_db(name))) {
|
||||
ut_a(strcmp(table_name, name) == 0);
|
||||
ut_a(memcmp(table_name, name, namelen) == 0);
|
||||
|
||||
table = dict_table_get_low(table_name);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user