summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorunknown <mikef@nslinux.bedford.progress.com>2001-03-21 15:34:16 -0500
committerunknown <mikef@nslinux.bedford.progress.com>2001-03-21 15:34:16 -0500
commitb4098ead8324790a52a70b4b35a3e83bc4c7ed54 (patch)
tree5306fccfc0c0c42aabf0e2dd6bf883cdecc3ed03 /sql/sql_table.cc
parent4b56b0ee43843dae2f5503718bd851f8debbd561 (diff)
downloadmariadb-git-b4098ead8324790a52a70b4b35a3e83bc4c7ed54.tar.gz
Add support for Gemini table handler, Monty has checked and approved
Fix bug when read return error acconfig.h: Add Gemini to configure acinclude.m4: Add Gemini to configure include/my_base.h: Add error codes for tables handlers mysql-test/t/select.test: Force temporary tables to MyISAM sql-bench/server-cfg.sh: Allow Gemini to run sql-bench sql/Makefile.am: Add Gemini to configure sql/handler.cc: Add support for Gemini table handler sql/handler.h: Add support for Gemini table handler sql/lex.h: Add support for Gemini table handler sql/mysqld.cc: Add support for Gemini table handler sql/opt_range.cc: Fix bug when read return error sql/records.cc: Fix bug when read return error sql/sql_class.cc: Add support for Gemini table handler sql/sql_class.h: Add support for Gemini table handler sql/sql_lex.h: Add support for Gemini table handler sql/sql_rename.cc: Add commit for table rename sql/sql_table.cc: Add commit for table rename BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index ed109127e30..3c15aa827cd 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1170,6 +1170,12 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
if (mysql_rename_table(old_db_type,db,table_name,new_db,new_name))
error= -1;
}
+ if (!error && (error=ha_commit_rename(thd)))
+ {
+ my_error(ER_GET_ERRNO,MYF(0),error);
+ error=1;
+ }
+
VOID(pthread_cond_broadcast(&COND_refresh));
VOID(pthread_mutex_unlock(&LOCK_open));
if (!error)
@@ -1603,6 +1609,7 @@ end_temporary:
DBUG_RETURN(0);
err:
+ (void) ha_commit_rename(thd); // Just for safety
DBUG_RETURN(-1);
}