1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Fixed bug in UNION

Fixed replication bug in load_master_data


BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Delete: include/global.h
Docs/manual.texi:
  Cleaned up "Things to do in 4.0"
mysql-test/r/union.result:
  New test
mysql-test/t/union.test:
  New test
mysys/my_lib.c:
  Cleanup
sql/mysql_priv.h:
  Fixed replication bug load_master_data
sql/sql_base.cc:
  Fixed bug in UNION
sql/sql_db.cc:
  Fixed replication bug load_master_data
sql/sql_parse.cc:
  Fixed replication bug load_master_data
sql/sql_repl.cc:
  Fixed replication bug load_master_data
sql/sql_union.cc:
  Fixed bug in UNION
tools/mysqlmanager.c:
  Portability fix
This commit is contained in:
unknown
2001-09-14 19:50:56 +03:00
parent cca5066521
commit af19fa4628
12 changed files with 106 additions and 1061 deletions

View File

@@ -1531,11 +1531,10 @@ int load_master_data(THD* thd)
continue;
}
if ((drop_error = mysql_rm_db(0, db, 1)) ||
mysql_create_db(0, db, 0))
if (mysql_rm_db(thd, db, 1,1) ||
mysql_create_db(thd, db, 0, 1))
{
error = (drop_error) ? ER_DB_DROP_DELETE : ER_CANT_CREATE_DB;
net_printf(&thd->net, error, db, my_error);
send_error(&thd->net, 0, 0);
cleanup_mysql_results(db_res, cur_table_res - 1, table_res);
goto err;
}