From 8cbba4051fa166f296b49bcfdc1ea9d071d42112 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 Oct 2001 02:50:28 +0300 Subject: Remved Gemini code. BitKeeper/deleted/.del-ha_gemini.cc~5d72172d33b00c6: Delete: sql/ha_gemini.cc BitKeeper/deleted/.del-ha_gemini.h~4dfccf1929195747: Delete: sql/ha_gemini.h BitKeeper/deleted/.del-gemini.result~89b4f9cced8dfc2f: Delete: mysql-test/r/gemini.result BitKeeper/deleted/.del-gemini.test~51d0362310e55e17: Delete: mysql-test/t/gemini.test BitKeeper/deleted/.del-have_gemini.inc~42f94f0dfd0f7b18: Delete: mysql-test/include/have_gemini.inc BitKeeper/deleted/.del-have_gemini.require~206702c48b2e206b: Delete: mysql-test/r/have_gemini.require BitKeeper/deleted/.del-gemini.dat~a73393a88b124b9f: Delete: mysql-test/std_data/gemini.dat BitKeeper/deleted/.del-isolation.test~6a39e4138dd4a456: Delete: mysql-test/t/isolation.test BitKeeper/deleted/.del-isolation.result~4da11e109a3d93a9: Delete: mysql-test/r/isolation.result acinclude.m4: Remved gemini code. configure.in: Remved gemini code. libmysql/libmysql.c: Remved gemini code. mysql-test/install_test_db.sh: Remved gemini code. scripts/mysql_install_db.sh: Remved gemini code. sql/Makefile.am: Remved gemini code. sql/field.cc: Remved gemini code. sql/field.h: Remved gemini code. sql/handler.cc: Remved gemini code. sql/handler.h: Remved gemini code. sql/lex.h: Remved gemini code. sql/mysqld.cc: Remved gemini code. sql/sql_base.cc: Remved gemini code. sql/sql_class.cc: Remved gemini code. sql/sql_class.h: Remved gemini code. sql/sql_lex.h: Remved gemini code. sql/sql_parse.cc: Remved gemini code. sql/sql_rename.cc: Remved gemini code. sql/sql_table.cc: Remved gemini code. sql/sql_yacc.yy: Remved gemini code. --- sql/sql_rename.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'sql/sql_rename.cc') diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 0f6e2f9fbf3..7a6652953cc 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -31,7 +31,7 @@ static TABLE_LIST *rename_tables(THD *thd, TABLE_LIST *table_list, bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list) { - bool error=1,cerror,got_all_locks=1; + bool error=1,got_all_locks=1; TABLE_LIST *lock_table,*ren_table=0; DBUG_ENTER("mysql_rename_tables"); @@ -87,12 +87,7 @@ end: } /* Lets hope this doesn't fail as the result will be messy */ - if ((cerror=ha_commit_rename(thd))) - { - my_error(ER_GET_ERRNO,MYF(0),cerror); - error= 1; - } - else if (!error) + if (!error) { mysql_update_log.write(thd,thd->query,thd->query_length); if (mysql_bin_log.is_open()) -- cgit v1.2.1