mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather copied mtr from 6.0-main here (at least this one knows how to run Maria tests). I also fixed suite/maria tests to be accepted by the new mtr. mysys/thr_mutex.c: adding DBUG_PRINT here, so that we can locate where the warning is issued.
This commit is contained in:
@@ -3590,7 +3590,6 @@ show_query_type(THD::enum_binlog_query_type qtype)
|
||||
default:
|
||||
DBUG_ASSERT(0 <= qtype && qtype < THD::QUERY_TYPE_COUNT);
|
||||
}
|
||||
|
||||
static char buf[64];
|
||||
sprintf(buf, "UNKNOWN#%d", qtype);
|
||||
return buf;
|
||||
|
Reference in New Issue
Block a user