Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
905613f8
Commit
905613f8
authored
9 years ago
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed wrong tests found by buildbot
parent
19d99faf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
13 deletions
+11
-13
mysql-test/r/mysqlbinlog_row_minimal.result
mysql-test/r/mysqlbinlog_row_minimal.result
+10
-10
mysql-test/r/view_debug.result
mysql-test/r/view_debug.result
+0
-1
mysql-test/t/mysqlbinlog_row_minimal.test
mysql-test/t/mysqlbinlog_row_minimal.test
+1
-1
mysql-test/t/view_debug.test
mysql-test/t/view_debug.test
+0
-1
No files found.
mysql-test/r/mysqlbinlog_row_minimal.result
View file @
905613f8
...
...
@@ -27,7 +27,7 @@ ROLLBACK/*!*/;
/*!100001 SET @@session.server_id=1*//*!*/;
/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at 352
#<date> server id 1 end_log_pos 532 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 532 Query thread_id=4 exec_time=
x
error_code=0
use `test`/*!*/;
SET TIMESTAMP=X/*!*/;
SET @@session.pseudo_thread_id=4/*!*/;
...
...
@@ -44,7 +44,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f
#<date> server id 1 end_log_pos 570 GTID 0-1-2 ddl
/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
# at 570
#<date> server id 1 end_log_pos 743 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 743 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1))
/*!*/;
...
...
@@ -69,7 +69,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# at 898
#<date> server id 1 end_log_pos 967 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 967 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
COMMIT
/*!*/;
...
...
@@ -94,7 +94,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
# at 1121
#<date> server id 1 end_log_pos 1190 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 1190 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
COMMIT
/*!*/;
...
...
@@ -119,7 +119,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# at 1343
#<date> server id 1 end_log_pos 1412 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 1412 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
COMMIT
/*!*/;
...
...
@@ -144,7 +144,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# at 1568
#<date> server id 1 end_log_pos 1637 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 1637 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
COMMIT
/*!*/;
...
...
@@ -202,7 +202,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# at 1890
#<date> server id 1 end_log_pos 1959 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 1959 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
COMMIT
/*!*/;
...
...
@@ -234,7 +234,7 @@ BEGIN
### SET
### @5=5 /* INT meta=0 nullable=1 is_null=0 */
# at 2119
#<date> server id 1 end_log_pos 2188 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 2188 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
COMMIT
/*!*/;
...
...
@@ -260,7 +260,7 @@ BEGIN
### WHERE
### @1=13 /* INT meta=0 nullable=0 is_null=0 */
# at 2328
#<date> server id 1 end_log_pos 2397 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 2397 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
COMMIT
/*!*/;
...
...
@@ -286,7 +286,7 @@ BEGIN
### WHERE
### @1=13 /* INT meta=0 nullable=0 is_null=0 */
# at 2537
#<date> server id 1 end_log_pos 2606 Query thread_id=4 exec_time=
0
error_code=0
#<date> server id 1 end_log_pos 2606 Query thread_id=4 exec_time=
x
error_code=0
SET TIMESTAMP=X/*!*/;
COMMIT
/*!*/;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/view_debug.result
View file @
905613f8
...
...
@@ -13,7 +13,6 @@ SET DEBUG_SYNC= 'now WAIT_FOR oppp';
SET DEBUG_SYNC= 'RESET';
CREATE ALGORITHM = TEMPTABLE VIEW v1 AS SELECT 2;
SET DEBUG_SYNC= 'now SIGNAL created';
SET DEBUG_SYNC= 'RESET';
3
3
SET DEBUG_SYNC= 'RESET';
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/mysqlbinlog_row_minimal.test
View file @
905613f8
...
...
@@ -27,7 +27,7 @@ DELETE FROM t2;
FLUSH
BINARY
LOGS
;
--
replace_result
$MYSQLTEST_VARDIR
MYSQLTEST_VARDIR
--
replace_regex
/
\d
{
6
}
*
\d
*:
\d\d
:
\d\d
/<
date
>/
/
Start
:.*
at
startup
/
Start
:
xxx
/
/
SET
TIMESTAMP
=
\d
*/
SET
TIMESTAMP
=
X
/
--
replace_regex
/
\d
{
6
}
*
\d
*:
\d\d
:
\d\d
/<
date
>/
/
Start
:.*
at
startup
/
Start
:
xxx
/
/
SET
TIMESTAMP
=
\d
*/
SET
TIMESTAMP
=
X
/
/
exec_time
=
\d
*/
exec_time
=
x
/
--
exec
$MYSQL_BINLOG
--
verbose
--
verbose
--
base64
-
output
=
DECODE
-
ROWS
$datadir
/
$binlog
DROP
TABLE
t1
,
t2
;
This diff is collapsed.
Click to expand it.
mysql-test/t/view_debug.test
View file @
905613f8
...
...
@@ -26,7 +26,6 @@ SET DEBUG_SYNC= 'now WAIT_FOR oppp';
SET
DEBUG_SYNC
=
'RESET'
;
CREATE
ALGORITHM
=
TEMPTABLE
VIEW
v1
AS
SELECT
2
;
SET
DEBUG_SYNC
=
'now SIGNAL created'
;
SET
DEBUG_SYNC
=
'RESET'
;
--
connection
con1
--
reap
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment