Commit 9e18773c authored by unknown's avatar unknown
Browse files

Merge marko@build.mysql.com:/home/bk/mysql-4.0

into hundin.mysql.fi:/home/marko/j/mysql-4.0

parents 2abb48de b89bb867
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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 @@ row_drop_database_for_mysql(
	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);