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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4e7979fe
Commit
4e7979fe
authored
Mar 14, 2008
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes
parent
54d26e02
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
mysql-test/r/merge.result
mysql-test/r/merge.result
+5
-5
mysql-test/r/type_set.result
mysql-test/r/type_set.result
+1
-0
mysql-test/suite/rpl/r/rpl_row_create_table.result
mysql-test/suite/rpl/r/rpl_row_create_table.result
+4
-4
No files found.
mysql-test/r/merge.result
View file @
4e7979fe
...
@@ -969,21 +969,21 @@ CREATE TABLE m1(a INT) ENGINE=MERGE;
...
@@ -969,21 +969,21 @@ CREATE TABLE m1(a INT) ENGINE=MERGE;
SHOW CREATE TABLE m1;
SHOW CREATE TABLE m1;
Table Create Table
Table Create Table
m1 CREATE TABLE `m1` (
m1 CREATE TABLE `m1` (
`a` int(11)
default
NULL
`a` int(11)
DEFAULT
NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
DROP TABLE m1;
DROP TABLE m1;
CREATE TABLE m1(a INT) ENGINE=MERGE UNION=();
CREATE TABLE m1(a INT) ENGINE=MERGE UNION=();
SHOW CREATE TABLE m1;
SHOW CREATE TABLE m1;
Table Create Table
Table Create Table
m1 CREATE TABLE `m1` (
m1 CREATE TABLE `m1` (
`a` int(11)
default
NULL
`a` int(11)
DEFAULT
NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
ALTER TABLE m1 UNION=(t1);
ALTER TABLE m1 UNION=(t1);
ALTER TABLE m1 UNION=();
ALTER TABLE m1 UNION=();
SHOW CREATE TABLE m1;
SHOW CREATE TABLE m1;
Table Create Table
Table Create Table
m1 CREATE TABLE `m1` (
m1 CREATE TABLE `m1` (
`a` int(11)
default
NULL
`a` int(11)
DEFAULT
NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1, m1;
DROP TABLE t1, m1;
End of 5.0 tests
End of 5.0 tests
...
@@ -1151,7 +1151,7 @@ SHOW CREATE TABLE t4;
...
@@ -1151,7 +1151,7 @@ SHOW CREATE TABLE t4;
Table Create Table
Table Create Table
t4 CREATE TABLE `t4` (
t4 CREATE TABLE `t4` (
`c1` int(11) DEFAULT NULL
`c1` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
UNION=()
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
INSERT INTO t4 VALUES (4);
INSERT INTO t4 VALUES (4);
ERROR HY000: Table 't4' is read only
ERROR HY000: Table 't4' is read only
DROP TABLE t4;
DROP TABLE t4;
...
@@ -1168,7 +1168,7 @@ SHOW CREATE TABLE t4;
...
@@ -1168,7 +1168,7 @@ SHOW CREATE TABLE t4;
Table Create Table
Table Create Table
t4 CREATE TABLE `t4` (
t4 CREATE TABLE `t4` (
`c1` int(11) DEFAULT NULL
`c1` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
UNION=()
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
INSERT INTO t4 VALUES (4);
INSERT INTO t4 VALUES (4);
ERROR HY000: Table 't4' is read only
ERROR HY000: Table 't4' is read only
DROP TABLE t4;
DROP TABLE t4;
...
...
mysql-test/r/type_set.result
View file @
4e7979fe
...
@@ -93,3 +93,4 @@ c
...
@@ -93,3 +93,4 @@ c
1,2,3
1,2,3
64
64
DROP TABLE t1;
DROP TABLE t1;
End of 5.0 tests
mysql-test/suite/rpl/r/rpl_row_create_table.result
View file @
4e7979fe
...
@@ -45,7 +45,7 @@ Table t2
...
@@ -45,7 +45,7 @@ Table t2
Create Table CREATE TABLE `t2` (
Create Table CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL,
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
`b` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
UNION=()
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE t3;
SHOW CREATE TABLE t3;
Table t3
Table t3
Create Table CREATE TABLE `t3` (
Create Table CREATE TABLE `t3` (
...
@@ -64,7 +64,7 @@ Table t2
...
@@ -64,7 +64,7 @@ Table t2
Create Table CREATE TABLE `t2` (
Create Table CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL,
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
`b` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
UNION=()
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE t3;
SHOW CREATE TABLE t3;
Table t3
Table t3
Create Table CREATE TABLE `t3` (
Create Table CREATE TABLE `t3` (
...
@@ -185,7 +185,7 @@ Table t8
...
@@ -185,7 +185,7 @@ Table t8
Create Table CREATE TABLE `t8` (
Create Table CREATE TABLE `t8` (
`a` int(11) DEFAULT NULL,
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
`b` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8
UNION=()
) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE t9;
SHOW CREATE TABLE t9;
Table t9
Table t9
Create Table CREATE TABLE `t9` (
Create Table CREATE TABLE `t9` (
...
@@ -205,7 +205,7 @@ Table t8
...
@@ -205,7 +205,7 @@ Table t8
Create Table CREATE TABLE `t8` (
Create Table CREATE TABLE `t8` (
`a` int(11) DEFAULT NULL,
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
`b` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8
UNION=()
) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE t9;
SHOW CREATE TABLE t9;
Table t9
Table t9
Create Table CREATE TABLE `t9` (
Create Table CREATE TABLE `t9` (
...
...
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