mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_parse.cc: Auto merged
This commit is contained in:
@ -2432,7 +2432,6 @@ mysql_execute_command(void)
|
||||
}
|
||||
else
|
||||
res= -1;
|
||||
thd->transaction.cleanup();
|
||||
break;
|
||||
}
|
||||
case SQLCOM_ROLLBACK:
|
||||
@ -2447,7 +2446,6 @@ mysql_execute_command(void)
|
||||
else
|
||||
res= -1;
|
||||
thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_STATUS_NO_TRANS_UPDATE);
|
||||
thd->transaction.cleanup();
|
||||
break;
|
||||
default: /* Impossible */
|
||||
send_ok(&thd->net);
|
||||
|
Reference in New Issue
Block a user