database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2000-11-16 00:24:11 +02:00
parent 49a245f4fa e69becf133
commit b689a1a752
56 changed files with 1946 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sql/sql_parse.cc
View File

@ -71,6 +71,20 @@ static void init_signals(void)
}
#endif
static inline bool end_active_trans(THD *thd)
{
if (!(thd->options & OPTION_AUTO_COMMIT) ||
(thd->options & OPTION_BEGIN))
{
if (ha_commit(thd))
return 1;
thd->options&= ~OPTION_BEGIN;
thd->server_status&= ~SERVER_STATUS_IN_TRANS;
}
return 0;
}
/*
** Check if user is ok
** Updates:
@ -1150,8 +1164,7 @@ mysql_execute_command(void)
}
}
/* ALTER TABLE ends previous transaction */
if ((!(thd->options & OPTION_AUTO_COMMIT) ||
(thd->options & OPTION_BEGIN)) && ha_commit(thd))
if (end_active_trans(thd))
res= -1;
else
res= mysql_alter_table(thd, lex->db, lex->name,
@ -1369,6 +1382,7 @@ mysql_execute_command(void)
break;
}
case SQLCOM_DELETE:
case SQLCOM_TRUNCATE:
{
if (check_access(thd,DELETE_ACL,tables->db,&tables->grant.privilege))
goto error; /* purecov: inspected */
@ -1376,11 +1390,12 @@ mysql_execute_command(void)
goto error;
// Set privilege for the WHERE clause
tables->grant.want_privilege=(SELECT_ACL & ~tables->grant.privilege);
res = mysql_delete(thd,tables,lex->where,lex->select_limit,
lex->lock_option, lex->options);
#ifdef DELETE_ITEMS
delete lex->where;
#endif
/* TRUNCATE ends previous transaction */
if (lex->sql_command == SQLCOM_TRUNCATE && end_active_trans(thd))
res= -1;
else
res = mysql_delete(thd,tables,lex->where,lex->select_limit,
lex->lock_option, lex->options);
break;
}
case SQLCOM_DROP_TABLE:
@ -1722,6 +1737,11 @@ mysql_execute_command(void)
send_ok(&thd->net);
break;
case SQLCOM_COMMIT:
/*
We don't use end_active_trans() here to ensure that this works
even if there is a problem with the OPTION_AUTO_COMMIT flag
(Which of course should never happen...)
*/
thd->options&= ~OPTION_BEGIN;
thd->server_status&= ~SERVER_STATUS_IN_TRANS;
if (!ha_commit(thd))
@ -2441,7 +2461,7 @@ bool reload_acl_and_cache(THD *thd, uint options, TABLE_LIST *tables)
bool result=0;
select_errors=0; /* Write if more errors */
mysql_log.flush(); // Flush log
// mysql_log.flush(); // Flush log
if (options & REFRESH_GRANT)
{
acl_reload();