diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-13 10:43:26 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-13 10:43:26 +0200 |
| commit | f8372252dd513eb1c4eac9e904b075f089efc4b9 (patch) | |
| tree | 1f373e45d58ab57f6c37987fe4220d16083010ac /mysql-test/extra | |
| parent | 3bc4d54073dbd878b5bd45eff96d79277c9b27b5 (diff) | |
| parent | 7dd46008503e7e4be844f32071a30db69abe9dc5 (diff) | |
| download | mariadb-git-f8372252dd513eb1c4eac9e904b075f089efc4b9.tar.gz | |
Merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/create_recursive_construct.inc | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/mysql-test/extra/rpl_tests/create_recursive_construct.inc b/mysql-test/extra/rpl_tests/create_recursive_construct.inc index 628f1735726..3a9c628cbb0 100644 --- a/mysql-test/extra/rpl_tests/create_recursive_construct.inc +++ b/mysql-test/extra/rpl_tests/create_recursive_construct.inc @@ -200,7 +200,7 @@ if (`SELECT $CRC_ARG_type = 1`) { if (`SELECT $CRC_ARG_type = 2`) { # It will be unsafe to call this procedure. --let $CRC_name= proc_$CRC_ARG_level - --let $CRC_create= CREATE PROCEDURE $CRC_name() BEGIN INSERT INTO ta$CRC_ARG_level VALUES (47); $CRC_ARG_stmt_sidef; END + --let $CRC_create= CREATE PROCEDURE $CRC_name() BEGIN $CRC_ARG_stmt_sidef; INSERT INTO ta$CRC_ARG_level VALUES (47); END --let $CRC_RET_stmt_sidef= CALL $CRC_name() --let $CRC_RET_value= --let $CRC_RET_sel_retval= @@ -344,25 +344,8 @@ if (`SELECT '$CRC_RET_stmt_sidef' != ''`) { if (`SELECT '$event_type' != 'Table_map'`) { --enable_query_log --echo ******** Failure! Event number 3 was a '$event_type', not a 'Table_map'. ******** - - # Currently, there is a bug causing some statements to be logged - # partially in statement format. Hence, we don't fail here, we - # just print the events (masking out nondeterministic components - # of the output) and continue. When binloggging works perfectly, - # we should instead execute: - #--enable_query_log - #SHOW BINLOG EVENTS; - #--die Wrong events in binlog. - - # Here, we should really source - # include/show_binlog_events.inc. But due to BUG#41913, that - # doesn't work, and we have to inline the entire file here. Sigh - # :-( - --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR 107 <binlog_start> - --replace_column 2 # 4 # 5 # - --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ - --eval SHOW BINLOG EVENTS FROM 107 - --disable_query_log + SHOW BINLOG EVENTS; + --die Wrong events in binlog. } SET binlog_format = STATEMENT; |