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

Added support for hex strings to mysqlimport

Browse Source 
A lot of new tests to mysqltest
Fixed bug with BDB tables and autocommit
This commit is contained in:
monty@donna.mysql.com
2000-12-28 03:56:38 +02:00
parent 361067e915
commit c0f40d14cc
215 changed files with 8597 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/handler.cc
View File

@@ -191,16 +191,13 @@ int ha_autocommit_or_rollback(THD *thd, int error)
{
DBUG_ENTER("ha_autocommit_or_rollback");
#ifdef USING_TRANSACTIONS
if (!(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN)))
if (!error)
{
if (!error)
{
if (ha_commit_stmt(thd))
error=1;
}
else
(void) ha_rollback_stmt(thd);
if (ha_commit_stmt(thd))
error=1;
}
else
(void) ha_rollback_stmt(thd);
#endif
DBUG_RETURN(error);
}
@@ -232,6 +229,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
}
#endif
#ifdef HAVE_INNOBASE_DB
if (trans->innobase_tid)
{
if ((error=innobase_commit(thd,trans->innobase_tid)))
{