summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/mysqltest.c83
-rw-r--r--innobase/pars/lexyy.c5
-rw-r--r--innobase/pars/pars0lex.l3
-rw-r--r--mysql-test/include/rpl_stmt_seq.inc2
-rw-r--r--mysql-test/r/rpl_ddl.result705
-rw-r--r--sql/sql_select.cc6
6 files changed, 66 insertions, 738 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index c172d18cbd0..ad1bc8f7269 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -164,10 +164,17 @@ static char TMPDIR[FN_REFLEN];
static char delimiter[MAX_DELIMITER]= DEFAULT_DELIMITER;
static uint delimiter_length= 1;
-static int *cur_block, *block_stack_end;
-static int block_stack[BLOCK_STACK_DEPTH];
+/* Block stack */
+enum block_cmd { cmd_none, cmd_if, cmd_while };
+typedef struct
+{
+ int line; /* Start line of block */
+ my_bool ok; /* Should block be executed */
+ enum block_cmd cmd; /* Command owning the block */
+} BLOCK;
+static BLOCK block_stack[BLOCK_STACK_DEPTH];
+static BLOCK *cur_block, *block_stack_end;
-static int block_ok_stack[BLOCK_STACK_DEPTH];
static CHARSET_INFO *charset_info= &my_charset_latin1; /* Default charset */
static const char *charset_name= "latin1"; /* Default character set name */
@@ -221,8 +228,6 @@ MYSQL_RES *last_result=0;
PARSER parser;
MASTER_POS master_pos;
-int *block_ok; /* set to 0 if the current block should not be executed */
-int false_block_depth = 0;
/* if set, all results are concated and compared against this file */
const char *result_file = 0;
@@ -296,6 +301,7 @@ Q_START_TIMER, Q_END_TIMER,
Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL,
Q_EXIT,
Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT,
+Q_IF,
Q_UNKNOWN, /* Unknown command. */
Q_COMMENT, /* Comments, ignored. */
@@ -386,6 +392,7 @@ const char *command_names[]=
"exit",
"disable_reconnect",
"enable_reconnect",
+ "if",
0
};
@@ -1924,36 +1931,54 @@ int do_connect(struct st_query* q)
int do_done(struct st_query* q)
{
+ /* Dummy statement to eliminate compiler warning */
q->type = Q_END_BLOCK;
+
+ /* Check if empty block stack */
if (cur_block == block_stack)
die("Stray '}' - end of block before beginning");
- if (*block_ok--)
+
+ /* Test if inner block has been executed */
+ if (cur_block->ok && cur_block->cmd == cmd_while)
{
- parser.current_line = *--cur_block;
+ /* Pop block from stack, re-execute outer block */
+ cur_block--;
+ parser.current_line = cur_block->line;
}
else
{
- ++parser.current_line;
- --cur_block;
+ /* Pop block from stack, goto next line */
+ cur_block--;
+ parser.current_line++;
}
return 0;
}
-int do_while(struct st_query* q)
+
+int do_block(enum block_cmd cmd, struct st_query* q)
{
char* p=q->first_argument;
const char* expr_start, *expr_end;
VAR v;
+
+ /* Check stack overflow */
if (cur_block == block_stack_end)
die("Nesting too deeply");
- if (!*block_ok)
+
+ /* Set way to find outer block again, increase line counter */
+ cur_block->line= parser.current_line++;
+
+ /* If this block is ignored */
+ if (!cur_block->ok)
{
- ++false_block_depth;
- *++block_ok = 0;
- *cur_block++ = parser.current_line++;
+ /* Inner block should be ignored too */
+ cur_block++;
+ cur_block->cmd= cmd;
+ cur_block->ok= FALSE;
return 0;
}
+ /* Parse and evaluate test expression */
expr_start = strchr(p, '(');
if (!expr_start)
die("missing '(' in while");
@@ -1962,14 +1987,12 @@ int do_while(struct st_query* q)
die("missing ')' in while");
var_init(&v,0,0,0,0);
eval_expr(&v, ++expr_start, &expr_end);
- *cur_block++ = parser.current_line++;
- if (!v.int_val)
- {
- *++block_ok = 0;
- false_block_depth++;
- }
- else
- *++block_ok = 1;
+
+ /* Define inner block */
+ cur_block++;
+ cur_block->cmd= cmd;
+ cur_block->ok= (v.int_val ? TRUE : FALSE);
+
var_free(&v);
return 0;
}
@@ -3653,12 +3676,13 @@ int main(int argc, char **argv)
lineno = lineno_stack;
my_init_dynamic_array(&q_lines, sizeof(struct st_query*), INIT_Q_LINES,
INIT_Q_LINES);
+
memset(block_stack, 0, sizeof(block_stack));
- block_stack_end = block_stack + BLOCK_STACK_DEPTH;
- memset(block_ok_stack, 0, sizeof(block_stack));
- cur_block = block_stack;
- block_ok = block_ok_stack;
- *block_ok = 1;
+ block_stack_end= block_stack + BLOCK_STACK_DEPTH;
+ cur_block= block_stack;
+ cur_block->ok= TRUE; /* Outer block should always be executed */
+ cur_block->cmd= cmd_none;
+
init_dynamic_string(&ds_res, "", 0, 65536);
parse_args(argc, argv);
@@ -3712,7 +3736,7 @@ int main(int argc, char **argv)
int current_line_inc = 1, processed = 0;
if (q->type == Q_UNKNOWN || q->type == Q_COMMENT_WITH_COMMAND)
get_query_type(q);
- if (*block_ok)
+ if (cur_block->ok)
{
processed = 1;
switch (q->type) {
@@ -3915,7 +3939,8 @@ int main(int argc, char **argv)
{
current_line_inc = 0;
switch (q->type) {
- case Q_WHILE: do_while(q); break;
+ case Q_WHILE: do_block(cmd_while, q); break;
+ case Q_IF: do_block(cmd_if, q); break;
case Q_END_BLOCK: do_done(q); break;
default: current_line_inc = 1; break;
}
diff --git a/innobase/pars/lexyy.c b/innobase/pars/lexyy.c
index 0112f618533..1145ca295e7 100644
--- a/innobase/pars/lexyy.c
+++ b/innobase/pars/lexyy.c
@@ -616,6 +616,9 @@ How to make the InnoDB parser and lexer C files:
7. Add '#include "univ.i"' before #include <stdio.h> in lexyy.c
(Needed for AIX)
+8. Add a type cast to int to the assignment below the comment
+ 'need more input.' (Removes a warning on Win64)
+
These instructions seem to work at least with bison-1.28 and flex-2.5.4 on
Linux.
*******************************************************/
@@ -2114,7 +2117,7 @@ static int input()
else
{ /* need more input */
- int offset = yy_c_buf_p - yytext_ptr;
+ int offset = (int) (yy_c_buf_p - yytext_ptr);
++yy_c_buf_p;
switch ( yy_get_next_buffer() )
diff --git a/innobase/pars/pars0lex.l b/innobase/pars/pars0lex.l
index 811057d48a1..e481634f77e 100644
--- a/innobase/pars/pars0lex.l
+++ b/innobase/pars/pars0lex.l
@@ -31,6 +31,9 @@ How to make the InnoDB parser and lexer C files:
7. Add '#include "univ.i"' before #include <stdio.h> in lexyy.c
(Needed for AIX)
+8. Add a type cast to int to the assignment below the comment
+ 'need more input.' (Removes a warning on Win64)
+
These instructions seem to work at least with bison-1.28 and flex-2.5.4 on
Linux.
*******************************************************/
diff --git a/mysql-test/include/rpl_stmt_seq.inc b/mysql-test/include/rpl_stmt_seq.inc
index d56ee02e33c..3c91505d0d6 100644
--- a/mysql-test/include/rpl_stmt_seq.inc
+++ b/mysql-test/include/rpl_stmt_seq.inc
@@ -7,7 +7,7 @@
###############################################################
# Debug options : To debug this test script
###############################################################
-let $showbinlog= 0;
+let $show_binlog= 0;
let $manipulate= 1;
######## The typical test sequence
diff --git a/mysql-test/r/rpl_ddl.result b/mysql-test/r/rpl_ddl.result
index a1e6b4e5cf6..3737883b694 100644
--- a/mysql-test/r/rpl_ddl.result
+++ b/mysql-test/r/rpl_ddl.result
@@ -49,156 +49,22 @@ INSERT INTO t1 SET f1= 0 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
1
-SHOW BINLOG EVENTS IN 'master-bin.000001';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3
-master-bin.000001 # Query 1 # CREATE DATABASE mysqltest1
-master-bin.000001 # Query 1 # CREATE DATABASE mysqltest2
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-master-bin.000001 # Xid 1 # COMMIT /* xid=17 */
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-master-bin.000001 # Xid 1 # COMMIT /* xid=25 */
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT)
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
0
-SHOW BINLOG EVENTS IN 'slave-bin.000001';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000001 # Query 2 # use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3
-slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest1
-slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest2
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT)
-------- switch to master -------
COMMIT;
SELECT MAX(f1) FROM t1;
MAX(f1)
1
-SHOW BINLOG EVENTS IN 'master-bin.000001';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3
-master-bin.000001 # Query 1 # CREATE DATABASE mysqltest1
-master-bin.000001 # Query 1 # CREATE DATABASE mysqltest2
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-master-bin.000001 # Xid 1 # COMMIT /* xid=17 */
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-master-bin.000001 # Xid 1 # COMMIT /* xid=25 */
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT)
-master-bin.000001 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000001 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1
-master-bin.000001 # Xid 1 # COMMIT /* xid=50 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
1
-SHOW BINLOG EVENTS IN 'slave-bin.000001';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000001 # Query 2 # use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3
-slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest1
-slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest2
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT)
-slave-bin.000001 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1
-------- switch to master -------
ROLLBACK;
@@ -207,42 +73,6 @@ MAX(f1)
1
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000001';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2
-master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3
-master-bin.000001 # Query 1 # CREATE DATABASE mysqltest1
-master-bin.000001 # Query 1 # CREATE DATABASE mysqltest2
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-master-bin.000001 # Xid 1 # COMMIT /* xid=17 */
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-master-bin.000001 # Xid 1 # COMMIT /* xid=25 */
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB"
-master-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT)
-master-bin.000001 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000001 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1
-master-bin.000001 # Xid 1 # COMMIT /* xid=50 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -250,39 +80,6 @@ MAX(f1)
1
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000001';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000001 # Query 2 # use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2
-slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3
-slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest1
-slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest2
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB"
-slave-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT)
-slave-bin.000001 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1
-------- switch to master -------
flush logs;
@@ -299,34 +96,22 @@ INSERT INTO t1 SET f1= 1 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
2
-SHOW BINLOG EVENTS IN 'master-bin.000002';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
1
-SHOW BINLOG EVENTS IN 'slave-bin.000002';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
ROLLBACK;
SELECT MAX(f1) FROM t1;
MAX(f1)
1
-SHOW BINLOG EVENTS IN 'master-bin.000002';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
1
-SHOW BINLOG EVENTS IN 'slave-bin.000002';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
ROLLBACK;
@@ -335,9 +120,6 @@ MAX(f1)
1
TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000002';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -345,9 +127,6 @@ MAX(f1)
1
TEST-INFO: SLAVE: The INSERT is not committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000002';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
flush logs;
@@ -364,37 +143,22 @@ INSERT INTO t1 SET f1= 1 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
2
-SHOW BINLOG EVENTS IN 'master-bin.000003';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000003 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
1
-SHOW BINLOG EVENTS IN 'slave-bin.000003';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000003 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
SET AUTOCOMMIT=1;
SELECT MAX(f1) FROM t1;
MAX(f1)
2
-SHOW BINLOG EVENTS IN 'master-bin.000003';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000003 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000003 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1
-master-bin.000003 # Xid 1 # COMMIT /* xid=89 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
2
-SHOW BINLOG EVENTS IN 'slave-bin.000003';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000003 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000003 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1
-------- switch to master -------
ROLLBACK;
@@ -403,11 +167,6 @@ MAX(f1)
2
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000003';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000003 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000003 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1
-master-bin.000003 # Xid 1 # COMMIT /* xid=89 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -415,10 +174,6 @@ MAX(f1)
2
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000003';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000003 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000003 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1
-------- switch to master -------
flush logs;
@@ -436,38 +191,22 @@ INSERT INTO t1 SET f1= 2 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
3
-SHOW BINLOG EVENTS IN 'master-bin.000004';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000004 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
2
-SHOW BINLOG EVENTS IN 'slave-bin.000004';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000004 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
START TRANSACTION;
SELECT MAX(f1) FROM t1;
MAX(f1)
3
-SHOW BINLOG EVENTS IN 'master-bin.000004';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000004 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000004 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000004 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1
-master-bin.000004 # Xid 1 # COMMIT /* xid=132 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
3
-SHOW BINLOG EVENTS IN 'slave-bin.000004';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000004 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000004 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1
-------- switch to master -------
ROLLBACK;
@@ -476,12 +215,6 @@ MAX(f1)
3
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000004';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000004 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000004 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000004 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1
-master-bin.000004 # Xid 1 # COMMIT /* xid=132 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -489,10 +222,6 @@ MAX(f1)
3
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000004';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000004 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000004 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1
-------- switch to master -------
flush logs;
@@ -509,38 +238,22 @@ INSERT INTO t1 SET f1= 3 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
4
-SHOW BINLOG EVENTS IN 'master-bin.000005';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000005 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
3
-SHOW BINLOG EVENTS IN 'slave-bin.000005';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000005 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
BEGIN;
SELECT MAX(f1) FROM t1;
MAX(f1)
4
-SHOW BINLOG EVENTS IN 'master-bin.000005';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000005 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000005 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000005 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1
-master-bin.000005 # Xid 1 # COMMIT /* xid=144 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
4
-SHOW BINLOG EVENTS IN 'slave-bin.000005';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000005 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000005 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1
-------- switch to master -------
ROLLBACK;
@@ -549,12 +262,6 @@ MAX(f1)
4
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000005';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000005 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000005 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000005 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1
-master-bin.000005 # Xid 1 # COMMIT /* xid=144 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -562,10 +269,6 @@ MAX(f1)
4
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000005';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000005 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000005 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1
-------- switch to master -------
flush logs;
@@ -582,40 +285,22 @@ INSERT INTO t1 SET f1= 4 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
5
-SHOW BINLOG EVENTS IN 'master-bin.000006';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000006 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
4
-SHOW BINLOG EVENTS IN 'slave-bin.000006';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000006 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
DROP TABLE mysqltest1.t2;
SELECT MAX(f1) FROM t1;
MAX(f1)
5
-SHOW BINLOG EVENTS IN 'master-bin.000006';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000006 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000006 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000006 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1
-master-bin.000006 # Xid 1 # COMMIT /* xid=171 */
-master-bin.000006 # Query 1 # use `mysqltest1`; DROP TABLE mysqltest1.t2
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
5
-SHOW BINLOG EVENTS IN 'slave-bin.000006';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000006 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000006 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1
-slave-bin.000006 # Query 1 # use `mysqltest1`; DROP TABLE mysqltest1.t2
-------- switch to master -------
ROLLBACK;
@@ -624,13 +309,6 @@ MAX(f1)
5
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000006';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000006 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000006 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000006 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1
-master-bin.000006 # Xid 1 # COMMIT /* xid=171 */
-master-bin.000006 # Query 1 # use `mysqltest1`; DROP TABLE mysqltest1.t2
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -638,11 +316,6 @@ MAX(f1)
5
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000006';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000006 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000006 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1
-slave-bin.000006 # Query 1 # use `mysqltest1`; DROP TABLE mysqltest1.t2
-------- switch to master -------
flush logs;
@@ -667,34 +340,22 @@ INSERT INTO t1 SET f1= 5 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
6
-SHOW BINLOG EVENTS IN 'master-bin.000007';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000007 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
5
-SHOW BINLOG EVENTS IN 'slave-bin.000007';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000007 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
DROP TEMPORARY TABLE mysqltest1.t23;
SELECT MAX(f1) FROM t1;
MAX(f1)
6
-SHOW BINLOG EVENTS IN 'master-bin.000007';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000007 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
5
-SHOW BINLOG EVENTS IN 'slave-bin.000007';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000007 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
ROLLBACK;
@@ -705,13 +366,6 @@ MAX(f1)
5
TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000007';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000007 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000007 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000007 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1
-master-bin.000007 # Query 1 # use `mysqltest1`; DROP TEMPORARY TABLE mysqltest1.t23
-master-bin.000007 # Query 1 # use `mysqltest1`; ROLLBACK
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -719,11 +373,6 @@ MAX(f1)
6
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000007';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000007 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000007 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1
-slave-bin.000007 # Query 1 # use `mysqltest1`; DROP TEMPORARY TABLE mysqltest1.t23
-------- switch to master -------
flush logs;
@@ -748,40 +397,22 @@ INSERT INTO t1 SET f1= 5 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
6
-SHOW BINLOG EVENTS IN 'master-bin.000008';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000008 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
6
-SHOW BINLOG EVENTS IN 'slave-bin.000008';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000008 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
RENAME TABLE mysqltest1.t3 to mysqltest1.t20;
SELECT MAX(f1) FROM t1;
MAX(f1)
6
-SHOW BINLOG EVENTS IN 'master-bin.000008';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000008 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000008 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000008 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1
-master-bin.000008 # Xid 1 # COMMIT /* xid=228 */
-master-bin.000008 # Query 1 # use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
6
-SHOW BINLOG EVENTS IN 'slave-bin.000008';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000008 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000008 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1
-slave-bin.000008 # Query 1 # use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20
-------- switch to master -------
ROLLBACK;
@@ -790,13 +421,6 @@ MAX(f1)
6
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000008';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000008 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000008 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000008 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1
-master-bin.000008 # Xid 1 # COMMIT /* xid=228 */
-master-bin.000008 # Query 1 # use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -804,11 +428,6 @@ MAX(f1)
6
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000008';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000008 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000008 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1
-slave-bin.000008 # Query 1 # use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20
-------- switch to master -------
flush logs;
@@ -835,40 +454,22 @@ INSERT INTO t1 SET f1= 6 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
7
-SHOW BINLOG EVENTS IN 'master-bin.000009';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000009 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
6
-SHOW BINLOG EVENTS IN 'slave-bin.000009';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000009 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT;
SELECT MAX(f1) FROM t1;
MAX(f1)
7
-SHOW BINLOG EVENTS IN 'master-bin.000009';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000009 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000009 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000009 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1
-master-bin.000009 # Xid 1 # COMMIT /* xid=257 */
-master-bin.000009 # Query 1 # use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
7
-SHOW BINLOG EVENTS IN 'slave-bin.000009';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000009 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000009 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1
-slave-bin.000009 # Query 1 # use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT
-------- switch to master -------
ROLLBACK;
@@ -877,13 +478,6 @@ MAX(f1)
7
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000009';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000009 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000009 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000009 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1
-master-bin.000009 # Xid 1 # COMMIT /* xid=257 */
-master-bin.000009 # Query 1 # use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -891,11 +485,6 @@ MAX(f1)
7
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000009';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000009 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000009 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1
-slave-bin.000009 # Query 1 # use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT
-------- switch to master -------
flush logs;
@@ -924,40 +513,22 @@ INSERT INTO t1 SET f1= 7 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
8
-SHOW BINLOG EVENTS IN 'master-bin.000010';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000010 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
7
-SHOW BINLOG EVENTS IN 'slave-bin.000010';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000010 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB";
SELECT MAX(f1) FROM t1;
MAX(f1)
8
-SHOW BINLOG EVENTS IN 'master-bin.000010';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000010 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000010 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000010 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1
-master-bin.000010 # Xid 1 # COMMIT /* xid=286 */
-master-bin.000010 # Query 1 # use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
8
-SHOW BINLOG EVENTS IN 'slave-bin.000010';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000010 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000010 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1
-slave-bin.000010 # Query 1 # use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"
-------- switch to master -------
ROLLBACK;
@@ -966,13 +537,6 @@ MAX(f1)
8
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000010';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000010 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000010 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000010 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1
-master-bin.000010 # Xid 1 # COMMIT /* xid=286 */
-master-bin.000010 # Query 1 # use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -980,11 +544,6 @@ MAX(f1)
8
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000010';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000010 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000010 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1
-slave-bin.000010 # Query 1 # use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"
-------- switch to master -------
flush logs;
@@ -1001,34 +560,22 @@ INSERT INTO t1 SET f1= 8 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
9
-SHOW BINLOG EVENTS IN 'master-bin.000011';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000011 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
8
-SHOW BINLOG EVENTS IN 'slave-bin.000011';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000011 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT);
SELECT MAX(f1) FROM t1;
MAX(f1)
9
-SHOW BINLOG EVENTS IN 'master-bin.000011';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000011 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
8
-SHOW BINLOG EVENTS IN 'slave-bin.000011';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000011 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
ROLLBACK;
@@ -1039,13 +586,6 @@ MAX(f1)
8
TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000011';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000011 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000011 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000011 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1
-master-bin.000011 # Query 1 # use `mysqltest1`; CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT)
-master-bin.000011 # Query 1 # use `mysqltest1`; ROLLBACK
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1053,11 +593,6 @@ MAX(f1)
9
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000011';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000011 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000011 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1
-slave-bin.000011 # Query 1 # use `mysqltest1`; CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT)
-------- switch to master -------
flush logs;
@@ -1074,41 +609,22 @@ INSERT INTO t1 SET f1= 8 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
9
-SHOW BINLOG EVENTS IN 'master-bin.000012';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000012 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
9
-SHOW BINLOG EVENTS IN 'slave-bin.000012';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000012 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
TRUNCATE TABLE mysqltest1.t7;
SELECT MAX(f1) FROM t1;
MAX(f1)
9
-SHOW BINLOG EVENTS IN 'master-bin.000012';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000012 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000012 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000012 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1
-master-bin.000012 # Xid 1 # COMMIT /* xid=343 */
-master-bin.000012 # Query 1 # use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7
-master-bin.000012 # Xid 1 # COMMIT /* xid=364 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
9
-SHOW BINLOG EVENTS IN 'slave-bin.000012';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000012 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000012 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1
-slave-bin.000012 # Query 1 # use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7
-------- switch to master -------
ROLLBACK;
@@ -1117,14 +633,6 @@ MAX(f1)
9
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000012';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000012 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000012 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000012 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1
-master-bin.000012 # Xid 1 # COMMIT /* xid=343 */
-master-bin.000012 # Query 1 # use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7
-master-bin.000012 # Xid 1 # COMMIT /* xid=364 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1132,11 +640,6 @@ MAX(f1)
9
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000012';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000012 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000012 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1
-slave-bin.000012 # Query 1 # use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7
-------- switch to master -------
flush logs;
@@ -1161,38 +664,22 @@ INSERT INTO t1 SET f1= 9 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'master-bin.000013';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000013 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
9
-SHOW BINLOG EVENTS IN 'slave-bin.000013';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000013 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ;
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'master-bin.000013';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000013 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000013 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000013 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1
-master-bin.000013 # Xid 1 # COMMIT /* xid=370 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'slave-bin.000013';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000013 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000013 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1
-------- switch to master -------
ROLLBACK;
@@ -1201,12 +688,6 @@ MAX(f1)
10
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000013';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000013 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000013 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000013 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1
-master-bin.000013 # Xid 1 # COMMIT /* xid=370 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1214,10 +695,6 @@ MAX(f1)
10
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000013';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000013 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000013 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1
-------- switch to master -------
flush logs;
@@ -1235,34 +712,22 @@ INSERT INTO t1 SET f1= 10 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
11
-SHOW BINLOG EVENTS IN 'master-bin.000014';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000014 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'slave-bin.000014';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000014 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
UNLOCK TABLES;
SELECT MAX(f1) FROM t1;
MAX(f1)
11
-SHOW BINLOG EVENTS IN 'master-bin.000014';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000014 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'slave-bin.000014';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000014 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
ROLLBACK;
@@ -1271,9 +736,6 @@ MAX(f1)
10
TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000014';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000014 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1281,9 +743,6 @@ MAX(f1)
10
TEST-INFO: SLAVE: The INSERT is not committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000014';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000014 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
flush logs;
@@ -1302,34 +761,22 @@ ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'master-bin.000015';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000015 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'slave-bin.000015';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000015 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
UNLOCK TABLES;
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'master-bin.000015';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000015 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'slave-bin.000015';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000015 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
ROLLBACK;
@@ -1338,9 +785,6 @@ MAX(f1)
10
TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000015';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000015 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1348,9 +792,6 @@ MAX(f1)
10
TEST-INFO: SLAVE: The INSERT is not committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000015';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000015 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
flush logs;
@@ -1368,38 +809,22 @@ INSERT INTO t1 SET f1= 10 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
11
-SHOW BINLOG EVENTS IN 'master-bin.000016';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000016 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
10
-SHOW BINLOG EVENTS IN 'slave-bin.000016';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000016 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
UNLOCK TABLES;
SELECT MAX(f1) FROM t1;
MAX(f1)
11
-SHOW BINLOG EVENTS IN 'master-bin.000016';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000016 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000016 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000016 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1
-master-bin.000016 # Xid 1 # COMMIT /* xid=463 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
11
-SHOW BINLOG EVENTS IN 'slave-bin.000016';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000016 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000016 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1
-------- switch to master -------
ROLLBACK;
@@ -1408,12 +833,6 @@ MAX(f1)
11
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000016';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000016 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000016 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000016 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1
-master-bin.000016 # Xid 1 # COMMIT /* xid=463 */
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1421,10 +840,6 @@ MAX(f1)
11
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000016';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000016 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000016 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1
-------- switch to master -------
flush logs;
@@ -1441,40 +856,22 @@ INSERT INTO t1 SET f1= 11 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
12
-SHOW BINLOG EVENTS IN 'master-bin.000017';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000017 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
11
-SHOW BINLOG EVENTS IN 'slave-bin.000017';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000017 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
DROP INDEX my_idx6 ON mysqltest1.t6;
SELECT MAX(f1) FROM t1;
MAX(f1)
12
-SHOW BINLOG EVENTS IN 'master-bin.000017';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000017 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000017 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000017 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1
-master-bin.000017 # Xid 1 # COMMIT /* xid=483 */
-master-bin.000017 # Query 1 # use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
12
-SHOW BINLOG EVENTS IN 'slave-bin.000017';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000017 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000017 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1
-slave-bin.000017 # Query 1 # use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6
-------- switch to master -------
ROLLBACK;
@@ -1483,13 +880,6 @@ MAX(f1)
12
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000017';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000017 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000017 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000017 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1
-master-bin.000017 # Xid 1 # COMMIT /* xid=483 */
-master-bin.000017 # Query 1 # use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1497,11 +887,6 @@ MAX(f1)
12
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000017';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000017 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000017 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1
-slave-bin.000017 # Query 1 # use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6
-------- switch to master -------
flush logs;
@@ -1526,40 +911,22 @@ INSERT INTO t1 SET f1= 12 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
13
-SHOW BINLOG EVENTS IN 'master-bin.000018';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000018 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
12
-SHOW BINLOG EVENTS IN 'slave-bin.000018';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000018 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
CREATE INDEX my_idx5 ON mysqltest1.t5(f1);
SELECT MAX(f1) FROM t1;
MAX(f1)
13
-SHOW BINLOG EVENTS IN 'master-bin.000018';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000018 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000018 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000018 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1
-master-bin.000018 # Xid 1 # COMMIT /* xid=510 */
-master-bin.000018 # Query 1 # use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1)
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
13
-SHOW BINLOG EVENTS IN 'slave-bin.000018';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000018 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000018 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1
-slave-bin.000018 # Query 1 # use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1)
-------- switch to master -------
ROLLBACK;
@@ -1568,13 +935,6 @@ MAX(f1)
13
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000018';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000018 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000018 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000018 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1
-master-bin.000018 # Xid 1 # COMMIT /* xid=510 */
-master-bin.000018 # Query 1 # use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1)
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1582,11 +942,6 @@ MAX(f1)
13
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000018';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000018 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000018 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1
-slave-bin.000018 # Query 1 # use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1)
-------- switch to master -------
flush logs;
@@ -1613,40 +968,22 @@ INSERT INTO t1 SET f1= 13 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
14
-SHOW BINLOG EVENTS IN 'master-bin.000019';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000019 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
13
-SHOW BINLOG EVENTS IN 'slave-bin.000019';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000019 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
DROP DATABASE mysqltest2;
SELECT MAX(f1) FROM t1;
MAX(f1)
14
-SHOW BINLOG EVENTS IN 'master-bin.000019';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000019 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000019 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000019 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1
-master-bin.000019 # Xid 1 # COMMIT /* xid=539 */
-master-bin.000019 # Query 1 # DROP DATABASE mysqltest2
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
14
-SHOW BINLOG EVENTS IN 'slave-bin.000019';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000019 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000019 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1
-slave-bin.000019 # Query 1 # DROP DATABASE mysqltest2
-------- switch to master -------
ROLLBACK;
@@ -1655,13 +992,6 @@ MAX(f1)
14
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000019';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000019 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000019 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000019 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1
-master-bin.000019 # Xid 1 # COMMIT /* xid=539 */
-master-bin.000019 # Query 1 # DROP DATABASE mysqltest2
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1669,11 +999,6 @@ MAX(f1)
14
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000019';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000019 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000019 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1
-slave-bin.000019 # Query 1 # DROP DATABASE mysqltest2
-------- switch to master -------
flush logs;
@@ -1698,40 +1023,22 @@ INSERT INTO t1 SET f1= 14 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
15
-SHOW BINLOG EVENTS IN 'master-bin.000020';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000020 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
14
-SHOW BINLOG EVENTS IN 'slave-bin.000020';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000020 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-------- switch to master -------
CREATE DATABASE mysqltest3;
SELECT MAX(f1) FROM t1;
MAX(f1)
15
-SHOW BINLOG EVENTS IN 'master-bin.000020';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000020 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000020 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000020 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1
-master-bin.000020 # Xid 1 # COMMIT /* xid=568 */
-master-bin.000020 # Query 1 # CREATE DATABASE mysqltest3
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
15
-SHOW BINLOG EVENTS IN 'slave-bin.000020';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000020 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000020 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1
-slave-bin.000020 # Query 1 # CREATE DATABASE mysqltest3
-------- switch to master -------
ROLLBACK;
@@ -1740,13 +1047,6 @@ MAX(f1)
15
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'master-bin.000020';
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000020 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000020 # Query 1 # use `mysqltest1`; BEGIN
-master-bin.000020 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1
-master-bin.000020 # Xid 1 # COMMIT /* xid=568 */
-master-bin.000020 # Query 1 # CREATE DATABASE mysqltest3
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
@@ -1754,11 +1054,6 @@ MAX(f1)
15
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-SHOW BINLOG EVENTS IN 'slave-bin.000020';
-Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000020 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000020 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1
-slave-bin.000020 # Query 1 # CREATE DATABASE mysqltest3
-------- switch to master -------
flush logs;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 36fb1737302..cc0aa44d865 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -28,6 +28,8 @@
#include <hash.h>
#include <ft_global.h>
+typedef uint32 cache_rec_length_type;
+
const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref",
"MAYBE_REF","ALL","range","index","fulltext",
"ref_or_null","unique_subquery","index_subquery",
@@ -11604,7 +11606,7 @@ used_blob_length(CACHE_FIELD **ptr)
static bool
store_record_in_cache(JOIN_CACHE *cache)
{
- ulong length;
+ cache_rec_length_type length;
uchar *pos;
CACHE_FIELD *copy,*end_field;
bool last_record;
@@ -11685,7 +11687,7 @@ static void
read_cached_record(JOIN_TAB *tab)
{
uchar *pos;
- uint length;
+ cache_rec_length_type length;
bool last_record;
CACHE_FIELD *copy,*end_field;