diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-06 15:51:36 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-06 15:51:36 +0300 |
| commit | 5cf5a9a1e8660cbcc60362d90cc22b63b2c05ed7 (patch) | |
| tree | 82e23e4fc7509a6c8f91966f5a77e0ffff680a78 /mysql-test/include/wait_show_condition.inc | |
| parent | 64e53a0f816ec0ca4792fcefe5be18494691bfe7 (diff) | |
| download | mariadb-git-5cf5a9a1e8660cbcc60362d90cc22b63b2c05ed7.tar.gz | |
Fixed timing failure in myisam-metadata.test
mysql-test/include/wait_show_condition.inc:
Print failing statement if timeout
mysql-test/r/myisam-metadata.result:
Updated DBUG_SYNC
mysql-test/t/myisam-metadata.test:
Updated DBUG_SYNC.
Removed wait_show_condtion, as this is not needed when we use DBUG_SYNC
This should fix timing issues with the test
mysys/thr_mutex.c:
Added comments
sql/sql_acl.cc:
atoi -> atoll() (Safety)
storage/myisam/ha_myisam.cc:
Send signal before mi_repair_by_sort.
Diffstat (limited to 'mysql-test/include/wait_show_condition.inc')
| -rw-r--r-- | mysql-test/include/wait_show_condition.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/wait_show_condition.inc b/mysql-test/include/wait_show_condition.inc index ae1600a7e30..b8dd9bdf971 100644 --- a/mysql-test/include/wait_show_condition.inc +++ b/mysql-test/include/wait_show_condition.inc @@ -127,5 +127,6 @@ if (!$found) echo # field : $field; echo # condition : $condition; echo # max_run_time : $max_run_time; + eval $show_statement; } |