1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

MDEV-7635: Test fixes

This commit is contained in:
Nirbhay Choubey
2016-12-21 23:02:51 -05:00
parent 3435e8a515
commit 91991c1e2d
19 changed files with 1696 additions and 1636 deletions

View File

@ -62,7 +62,7 @@ while ($ddl_cases >= 1)
#
if (`select @@binlog_format = 'ROW'`)
{
let $commit_event_row_number= 4;
let $commit_event_row_number= 5;
}
let $first_binlog_position= query_get_value("SHOW MASTER STATUS", Position, 1);
@ -164,7 +164,7 @@ while ($ddl_cases >= 1)
#
if (`select @@binlog_format = 'ROW'`)
{
let $commit_event_row_number= 5;
let $commit_event_row_number= 6;
}
}
if ($ddl_cases == 22)
@ -250,7 +250,7 @@ while ($ddl_cases >= 1)
#
if (`select @@binlog_format = 'MIXED'`)
{
let $commit_event_row_number= 4;
let $commit_event_row_number= 5;
}
}
if ($ddl_cases == 9)
@ -267,7 +267,7 @@ while ($ddl_cases >= 1)
#
if (`select @@binlog_format = 'MIXED'`)
{
let $commit_event_row_number= 4;
let $commit_event_row_number= 5;
}
}
if ($ddl_cases == 8)
@ -293,10 +293,14 @@ while ($ddl_cases >= 1)
# 3: ROW EVENT
# 4: COMMIT
#
if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'ROW'`)
if (`select @@binlog_format = 'STATEMENT'`)
{
let $commit_event_row_number= 4;
}
if (`select @@binlog_format = 'ROW'`)
{
let $commit_event_row_number= 5;
}
# In MIXED mode, the changes are logged as rows and we have what follows:
#
# 1: BEGIN
@ -307,7 +311,7 @@ while ($ddl_cases >= 1)
#
if (`select @@binlog_format = 'MIXED'`)
{
let $commit_event_row_number= 5;
let $commit_event_row_number= 6;
}
}
if ($ddl_cases == 7)