diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-09-27 20:09:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-09-27 20:09:46 +0200 |
| commit | 474fe6d9d9e0b4d8803bdf439dd017ba0c729729 (patch) | |
| tree | 6b088655217934bf0cbb6cdf85df0a217ef1d939 /storage/maria/ma_write.c | |
| parent | cd9f773020c6ddfc1ea39e9037e4258b8bc32a08 (diff) | |
| download | mariadb-git-474fe6d9d9e0b4d8803bdf439dd017ba0c729729.tar.gz | |
fixes for test failures
and small collateral changes
mysql-test/lib/My/Test.pm:
somehow with "print" we get truncated writes sometimes
mysql-test/suite/perfschema/r/digest_table_full.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/dml_handler.result:
host table is not ported over yet
mysql-test/suite/perfschema/r/information_schema.result:
host table is not ported over yet
mysql-test/suite/perfschema/r/nesting.result:
this differs, because we don't rewrite general log queries, and multi-statement
packets are logged as a one entry. this result file is identical to what mysql-5.6.5
produces with the --log-raw option.
mysql-test/suite/perfschema/r/relaylog.result:
MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB.
mysql-test/suite/perfschema/r/server_init.result:
MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup.
mysql-test/suite/perfschema/r/stage_mdl_global.result:
this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not
do that, and this causes useless mutex locks and waits.
mysql-test/suite/perfschema/r/statement_digest.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/statement_digest_consumers.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/statement_digest_long_query.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result:
will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged
mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result:
will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
Diffstat (limited to 'storage/maria/ma_write.c')
| -rw-r--r-- | storage/maria/ma_write.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index f1649083105..14385328186 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -237,7 +237,7 @@ int maria_write(MARIA_HA *info, uchar *record) /* running. now we wait */ WT_RESOURCE_ID rc; int res; - const char *old_proc_info; + PSI_stage_info old_stage_info; rc.type= &ma_rc_dup_unique; /* TODO savepoint id when we'll have them */ @@ -249,11 +249,10 @@ int maria_write(MARIA_HA *info, uchar *record) my_errno= HA_ERR_LOCK_DEADLOCK; goto err; } - old_proc_info= proc_info_hook(0, - "waiting for a resource", - __func__, __FILE__, __LINE__); + proc_info_hook(0, &stage_waiting_for_a_resource, &old_stage_info, + __func__, __FILE__, __LINE__); res= wt_thd_cond_timedwait(info->trn->wt, & blocker->state_lock); - proc_info_hook(0, old_proc_info, __func__, __FILE__, __LINE__); + proc_info_hook(0, &old_stage_info, 0, __func__, __FILE__, __LINE__); mysql_mutex_unlock(& blocker->state_lock); if (res != WT_OK) |