mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.2' into 10.3

Browse source
This commit is contained in:
Sergei Golubchik 2018-03-28 17:06:27 +02:00
commit b1818dccf7
344 changed files with 8713 additions and 6819 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/include/maybe_debug.combinations Normal file
View file

@ -0,0 +1,5 @@
[debug]
--enable-gdb
[release]
--disable-gdb

3
mysql-test/include/maybe_debug.inc Normal file
View file

@ -0,0 +1,3 @@
# include file for test files that can be run with and without debug
# having debug and non-debug tests.
let $have_debug=`select version() like '%debug%'`;

2
mysql-test/include/wait_condition.inc
View file

@ -39,7 +39,7 @@ let $wait_timeout= 0;
let $wait_condition_reps= 0;
while ($wait_counter)
{
--error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT,ER_UNKNOWN_COM_ERROR
--error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT,ER_UNKNOWN_COM_ERROR,ER_LOCK_DEADLOCK
let $success= `$wait_condition`;
inc $wait_condition_reps;
if ($success)