database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

mysql-5.5.34 merge

Browse Source 
(some patches reverted, test case added)
This commit is contained in:
Sergei Golubchik
2013-11-19 13:16:25 +01:00
parent efab095c7f 543b6e0224
commit fa3f8a18b2
91 changed files with 951 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_cache.cc
View File

@ -1,4 +1,5 @@
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2010, 2013, Monty Program Ab
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -2033,7 +2034,12 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
*/
thd->query_cache_is_applicable= 0; // Query can't be cached
}
/* End the statement transaction potentially started by engine. */
/*
End the statement transaction potentially started by engine.
Currently our engines do not request rollback from callbacks.
If this is going to change code needs to be reworked.
*/
DBUG_ASSERT(! thd->transaction_rollback_request);
trans_rollback_stmt(thd);
goto err_unlock; // Parse query
}