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
d4f1d04f
Commit
d4f1d04f
authored
May 11, 2011
by
Magnus Blåudd
Browse files
Options
Browse Files
Download
Plain Diff
Merge bug 12384993
parents
40de2831
46c08b94
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
mysql-test/extra/rpl_tests/check_type.inc
mysql-test/extra/rpl_tests/check_type.inc
+12
-2
mysql-test/suite/rpl/r/rpl_typeconv.result
mysql-test/suite/rpl/r/rpl_typeconv.result
+1
-1
mysql-test/suite/rpl/t/rpl_typeconv.test
mysql-test/suite/rpl/t/rpl_typeconv.test
+1
-1
No files found.
mysql-test/extra/rpl_tests/check_type.inc
View file @
d4f1d04f
...
...
@@ -11,18 +11,28 @@
# on the slave)
# $can_convert True if conversion shall work, false if it
# shall generate an error
# $engine_type The storage engine to be used for storing table
# on both master and slave
if
(
!
$engine_type
)
{
# Use the default storage engine
let
$engine_type
=
`SELECT @@storage_engine`
;
}
connection
master
;
disable_warnings
;
DROP
TABLE
IF
EXISTS
t1
;
enable_warnings
;
eval
CREATE
TABLE
t1
(
a
$source_type
);
eval
CREATE
TABLE
t1
(
pk
INT
NOT
NULL
PRIMARY
KEY
,
a
$source_type
)
ENGINE
=
$engine_type
;
sync_slave_with_master
;
eval
ALTER
TABLE
t1
MODIFY
a
$target_type
;
connection
master
;
eval
INSERT
INTO
t1
VALUES
(
$source_value
);
eval
INSERT
INTO
t1
VALUES
(
1
,
$source_value
);
if
(
$can_convert
)
{
sync_slave_with_master
;
eval
SELECT
a
=
$target_value
into
@
compare
FROM
t1
;
...
...
mysql-test/suite/rpl/r/rpl_typeconv.result
View file @
d4f1d04f
...
...
@@ -534,7 +534,7 @@ BIT(6) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(5) BIT(12) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(12) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
DROP TABLE type_conversions;
call mtr.add_suppression("Slave SQL.*Column
0
of table .test.t1. cannot be converted from type.* Error_code: 1677");
call mtr.add_suppression("Slave SQL.*Column
1
of table .test.t1. cannot be converted from type.* Error_code: 1677");
DROP TABLE t1;
set global slave_type_conversions = @saved_slave_type_conversions;
include/rpl_end.inc
mysql-test/suite/rpl/t/rpl_typeconv.test
View file @
d4f1d04f
...
...
@@ -61,7 +61,7 @@ SELECT RPAD(Source, 15, ' ') AS Source_Type,
enable_query_log
;
DROP
TABLE
type_conversions
;
call
mtr
.
add_suppression
(
"Slave SQL.*Column
0
of table .test.t1. cannot be converted from type.* Error_code: 1677"
);
call
mtr
.
add_suppression
(
"Slave SQL.*Column
1
of table .test.t1. cannot be converted from type.* Error_code: 1677"
);
connection
master
;
DROP
TABLE
t1
;
...
...
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