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
0c487a79
Commit
0c487a79
authored
19 years ago
by
brian@zim.tangent.org
Browse files
Options
Browse Files
Download
Plain Diff
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.tangent.org:/home/brian/mysql/dep-5.1
parents
eb968344
0a5a30be
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
59 additions
and
299 deletions
+59
-299
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
+1
-1
mysql-test/r/binlog_stm_mix_innodb_myisam.result
mysql-test/r/binlog_stm_mix_innodb_myisam.result
+16
-16
mysql-test/r/ctype_ujis.result
mysql-test/r/ctype_ujis.result
+2
-2
mysql-test/r/innodb_concurrent.result
mysql-test/r/innodb_concurrent.result
+7
-7
mysql-test/r/rpl_heap.result
mysql-test/r/rpl_heap.result
+3
-3
mysql-test/r/warnings.result
mysql-test/r/warnings.result
+0
-7
mysql-test/t/ctype_ujis.test
mysql-test/t/ctype_ujis.test
+2
-2
mysql-test/t/innodb_concurrent.test
mysql-test/t/innodb_concurrent.test
+7
-7
mysql-test/t/raid.test
mysql-test/t/raid.test
+0
-224
mysql-test/t/rpl_heap.test
mysql-test/t/rpl_heap.test
+1
-1
mysql-test/t/system_mysql_db_fix.test
mysql-test/t/system_mysql_db_fix.test
+3
-3
mysql-test/t/warnings.test
mysql-test/t/warnings.test
+0
-8
scripts/fill_func_tables.sh
scripts/fill_func_tables.sh
+3
-3
scripts/mysql_convert_table_format.sh
scripts/mysql_convert_table_format.sh
+2
-2
sql/ha_innodb.cc
sql/ha_innodb.cc
+1
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+0
-1
tests/fork_big.pl
tests/fork_big.pl
+1
-1
tests/fork_big2.pl
tests/fork_big2.pl
+1
-1
tests/mail_to_db.pl
tests/mail_to_db.pl
+1
-1
tests/mysql_client_test.c
tests/mysql_client_test.c
+8
-8
No files found.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
View file @
0c487a79
...
@@ -197,7 +197,7 @@ connection con3;
...
@@ -197,7 +197,7 @@ connection con3;
delete
from
t1
;
delete
from
t1
;
delete
from
t2
;
delete
from
t2
;
--
disable_warnings
--
disable_warnings
alter
table
t2
typ
e
=
MyISAM
;
alter
table
t2
engin
e
=
MyISAM
;
--
enable_warnings
--
enable_warnings
insert
into
t1
values
(
1
);
insert
into
t1
values
(
1
);
begin
;
begin
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/binlog_stm_mix_innodb_myisam.result
View file @
0c487a79
...
@@ -185,7 +185,7 @@ master-bin.000001 258 Query 1 # use `test`; insert into t1 values(18)
...
@@ -185,7 +185,7 @@ master-bin.000001 258 Query 1 # use `test`; insert into t1 values(18)
master-bin.000001 346 Xid 1 # COMMIT /* xid= */
master-bin.000001 346 Xid 1 # COMMIT /* xid= */
delete from t1;
delete from t1;
delete from t2;
delete from t2;
alter table t2
typ
e=MyISAM;
alter table t2
engin
e=MyISAM;
insert into t1 values (1);
insert into t1 values (1);
begin;
begin;
select * from t1 for update;
select * from t1 for update;
...
@@ -239,20 +239,20 @@ master-bin.000001 373 Query 1 # use `test`; delete from t1
...
@@ -239,20 +239,20 @@ master-bin.000001 373 Query 1 # use `test`; delete from t1
master-bin.000001 450 Xid 1 # COMMIT /* xid= */
master-bin.000001 450 Xid 1 # COMMIT /* xid= */
master-bin.000001 477 Query 1 # use `test`; delete from t2
master-bin.000001 477 Query 1 # use `test`; delete from t2
master-bin.000001 554 Xid 1 # COMMIT /* xid= */
master-bin.000001 554 Xid 1 # COMMIT /* xid= */
master-bin.000001 581 Query 1 # use `test`; alter table t2
typ
e=MyISAM
master-bin.000001 581 Query 1 # use `test`; alter table t2
engin
e=MyISAM
master-bin.000001 67
0
Query 1 # use `test`; insert into t1 values (1)
master-bin.000001 67
2
Query 1 # use `test`; insert into t1 values (1)
master-bin.000001 7
58
Xid 1 # COMMIT /* xid= */
master-bin.000001 7
60
Xid 1 # COMMIT /* xid= */
master-bin.000001 78
5
Query 1 # use `test`; insert into t2 values (20)
master-bin.000001 78
7
Query 1 # use `test`; insert into t2 values (20)
master-bin.000001 87
4
Query 1 # use `test`; drop table t1,t2
master-bin.000001 87
6
Query 1 # use `test`; drop table t1,t2
master-bin.000001 95
3
Query 1 # use `test`; create temporary table ti (a int) engine=innodb
master-bin.000001 95
5
Query 1 # use `test`; create temporary table ti (a int) engine=innodb
master-bin.000001 106
3
Query 1 # use `test`; insert into ti values(1)
master-bin.000001 106
5
Query 1 # use `test`; insert into ti values(1)
master-bin.000001 115
0
Xid 1 # COMMIT /* xid= */
master-bin.000001 115
2
Xid 1 # COMMIT /* xid= */
master-bin.000001 117
7
Query 1 # use `test`; create temporary table t1 (a int) engine=myisam
master-bin.000001 117
9
Query 1 # use `test`; create temporary table t1 (a int) engine=myisam
master-bin.000001 128
7
Query 1 # use `test`; insert t1 values (1)
master-bin.000001 128
9
Query 1 # use `test`; insert t1 values (1)
master-bin.000001 137
0
Query 1 # use `test`; create table t0 (n int)
master-bin.000001 137
2
Query 1 # use `test`; create table t0 (n int)
master-bin.000001 145
6
Query 1 # use `test`; insert t0 select * from t1
master-bin.000001 145
8
Query 1 # use `test`; insert t0 select * from t1
master-bin.000001 154
5
Query 1 # use `test`; insert into t0 select GET_LOCK("lock1",null)
master-bin.000001 154
7
Query 1 # use `test`; insert into t0 select GET_LOCK("lock1",null)
master-bin.000001 165
2
Query 1 # use `test`; create table t2 (n int) engine=innodb
master-bin.000001 165
4
Query 1 # use `test`; create table t2 (n int) engine=innodb
master-bin.000001 175
2
Query 1 # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
master-bin.000001 175
4
Query 1 # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
do release_lock("lock1");
do release_lock("lock1");
drop table t0,t2;
drop table t0,t2;
This diff is collapsed.
Click to expand it.
mysql-test/r/ctype_ujis.result
View file @
0c487a79
...
@@ -132,7 +132,7 @@ a INTEGER NOT NULL,
...
@@ -132,7 +132,7 @@ a INTEGER NOT NULL,
b VARCHAR(50) NOT NULL DEFAULT '',
b VARCHAR(50) NOT NULL DEFAULT '',
PRIMARY KEY (a),
PRIMARY KEY (a),
KEY b (b(10))
KEY b (b(10))
)
TYP
E=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
)
ENGIN
E=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');
INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');
...
@@ -152,7 +152,7 @@ a INTEGER NOT NULL,
...
@@ -152,7 +152,7 @@ a INTEGER NOT NULL,
b VARCHAR(50) NOT NULL DEFAULT '',
b VARCHAR(50) NOT NULL DEFAULT '',
PRIMARY KEY (a),
PRIMARY KEY (a),
KEY b (b(10))
KEY b (b(10))
)
TYP
E=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
)
ENGIN
E=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');
INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/innodb_concurrent.result
View file @
0c487a79
drop table if exists t1;
drop table if exists t1;
Warnings:
Warnings:
Note 1051 Unknown table 't1'
Note 1051 Unknown table 't1'
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
type
=innodb;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
ENGINE
=innodb;
Warnings:
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...
@@ -106,7 +106,7 @@ eta tipo c
...
@@ -106,7 +106,7 @@ eta tipo c
2 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
2 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
1 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
1 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1;
drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
type
=innodb;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
ENGINE
=innodb;
Warnings:
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...
@@ -239,7 +239,7 @@ a b
...
@@ -239,7 +239,7 @@ a b
1 1
1 1
commit;
commit;
drop table t1;
drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
type
=innodb;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
ENGINE
=innodb;
Warnings:
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...
@@ -323,7 +323,7 @@ eta tipo c
...
@@ -323,7 +323,7 @@ eta tipo c
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1;
drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
type
=innodb;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
ENGINE
=innodb;
Warnings:
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...
@@ -407,7 +407,7 @@ eta tipo c
...
@@ -407,7 +407,7 @@ eta tipo c
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1;
drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
type
=innodb;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
ENGINE
=innodb;
Warnings:
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...
@@ -478,7 +478,7 @@ eta tipo c
...
@@ -478,7 +478,7 @@ eta tipo c
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1;
drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
type
=innodb;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
ENGINE
=innodb;
Warnings:
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...
@@ -549,7 +549,7 @@ eta tipo c
...
@@ -549,7 +549,7 @@ eta tipo c
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1;
drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
type
=innodb;
create table t1(eta int(11) not null, tipo int(11), c varchar(255))
ENGINE
=innodb;
Warnings:
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_heap.result
View file @
0c487a79
reset master;
reset master;
drop table if exists t1;
drop table if exists t1;
create table t1
type
=HEAP select 10 as a;
create table t1
ENGINE
=HEAP select 10 as a;
insert into t1 values(11);
insert into t1 values(11);
show binlog events from 79;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use `test`; create table t1
type
=HEAP select 10 as a
master-bin.001 79 Query 1 79 use `test`; create table t1
ENGINE
=HEAP select 10 as a
master-bin.001 154 Query 1 154 use `test`; insert into t1 values(11)
master-bin.001 154 Query 1 154 use `test`; insert into t1 values(11)
reset slave;
reset slave;
start slave;
start slave;
...
@@ -12,7 +12,7 @@ show create table t1;
...
@@ -12,7 +12,7 @@ show create table t1;
Table Create Table
Table Create Table
t1 CREATE TABLE `t1` (
t1 CREATE TABLE `t1` (
`a` bigint(2) NOT NULL default '0'
`a` bigint(2) NOT NULL default '0'
)
TYP
E=HEAP
)
ENGIN
E=HEAP
select * from t1;
select * from t1;
a
a
10
10
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/warnings.result
View file @
0c487a79
...
@@ -166,13 +166,6 @@ show variables like 'max_error_count';
...
@@ -166,13 +166,6 @@ show variables like 'max_error_count';
Variable_name Value
Variable_name Value
max_error_count 10
max_error_count 10
drop table t1;
drop table t1;
create table t1 (id int) type=heap;
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
alter table t1 type=myisam;
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
drop table t1;
set table_type=MYISAM;
set table_type=MYISAM;
Warnings:
Warnings:
Warning 1287 'table_type' is deprecated; use 'storage_engine' instead
Warning 1287 'table_type' is deprecated; use 'storage_engine' instead
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/ctype_ujis.test
View file @
0c487a79
...
@@ -94,7 +94,7 @@ CREATE TABLE t1
...
@@ -94,7 +94,7 @@ CREATE TABLE t1
b
VARCHAR
(
50
)
NOT
NULL
DEFAULT
''
,
b
VARCHAR
(
50
)
NOT
NULL
DEFAULT
''
,
PRIMARY
KEY
(
a
),
PRIMARY
KEY
(
a
),
KEY
b
(
b
(
10
))
KEY
b
(
b
(
10
))
)
TYP
E
=
InnoDB
CHARACTER
SET
'ujis'
COLLATE
'ujis_japanese_ci'
;
)
ENGIN
E
=
InnoDB
CHARACTER
SET
'ujis'
COLLATE
'ujis_japanese_ci'
;
--
enable_warnings
--
enable_warnings
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
0
,
'aaabbbcccddd'
);
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
0
,
'aaabbbcccddd'
);
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
1
,
'eeefffggghhh'
);
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
1
,
'eeefffggghhh'
);
...
@@ -110,7 +110,7 @@ CREATE TABLE t1
...
@@ -110,7 +110,7 @@ CREATE TABLE t1
b
VARCHAR
(
50
)
NOT
NULL
DEFAULT
''
,
b
VARCHAR
(
50
)
NOT
NULL
DEFAULT
''
,
PRIMARY
KEY
(
a
),
PRIMARY
KEY
(
a
),
KEY
b
(
b
(
10
))
KEY
b
(
b
(
10
))
)
TYP
E
=
MyISAM
CHARACTER
SET
'ujis'
COLLATE
'ujis_japanese_ci'
;
)
ENGIN
E
=
MyISAM
CHARACTER
SET
'ujis'
COLLATE
'ujis_japanese_ci'
;
--
enable_warnings
--
enable_warnings
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
0
,
'aaabbbcccddd'
);
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
0
,
'aaabbbcccddd'
);
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
1
,
'eeefffggghhh'
);
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
1
,
'eeefffggghhh'
);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/innodb_concurrent.test
View file @
0c487a79
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
connection
default
;
connection
default
;
drop
table
if
exists
t1
;
drop
table
if
exists
t1
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
typ
e
=
innodb
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
engin
e
=
innodb
;
connect
(
thread1
,
localhost
,
mysqltest
,,);
connect
(
thread1
,
localhost
,
mysqltest
,,);
connection
thread1
;
connection
thread1
;
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
...
@@ -57,7 +57,7 @@ drop table t1;
...
@@ -57,7 +57,7 @@ drop table t1;
#
#
#connect (thread1, localhost, mysqltest,,);
#connect (thread1, localhost, mysqltest,,);
connection
thread1
;
connection
thread1
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
typ
e
=
innodb
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
engin
e
=
innodb
;
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
...
@@ -132,7 +132,7 @@ drop table t1;
...
@@ -132,7 +132,7 @@ drop table t1;
#
#
#connect (thread1, localhost, mysqltest,,);
#connect (thread1, localhost, mysqltest,,);
connection
thread1
;
connection
thread1
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
typ
e
=
innodb
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
engin
e
=
innodb
;
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
...
@@ -175,7 +175,7 @@ drop table t1;
...
@@ -175,7 +175,7 @@ drop table t1;
#
#
#connect (thread1, localhost, mysqltest,,);
#connect (thread1, localhost, mysqltest,,);
connection
thread1
;
connection
thread1
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
typ
e
=
innodb
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
engin
e
=
innodb
;
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
...
@@ -218,7 +218,7 @@ drop table t1;
...
@@ -218,7 +218,7 @@ drop table t1;
#
#
#connect (thread1, localhost, mysqltest,,);
#connect (thread1, localhost, mysqltest,,);
connection
thread1
;
connection
thread1
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
typ
e
=
innodb
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
engin
e
=
innodb
;
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
...
@@ -261,7 +261,7 @@ drop table t1;
...
@@ -261,7 +261,7 @@ drop table t1;
#
#
#connect (thread1, localhost, mysqltest,,);
#connect (thread1, localhost, mysqltest,,);
connection
thread1
;
connection
thread1
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
typ
e
=
innodb
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
engin
e
=
innodb
;
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
...
@@ -305,7 +305,7 @@ drop table t1;
...
@@ -305,7 +305,7 @@ drop table t1;
#
#
#connect (thread1, localhost, mysqltest,,);
#connect (thread1, localhost, mysqltest,,);
connection
thread1
;
connection
thread1
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
typ
e
=
innodb
;
create
table
t1
(
eta
int
(
11
)
not
null
,
tipo
int
(
11
),
c
varchar
(
255
))
engin
e
=
innodb
;
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
7
,
7
,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
8
,
8
,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
insert
into
t1
values
(
10
,
1
,
"ccccccccccccccccccccccccccccccccccccccccccc"
);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/raid.test
deleted
100644 → 0
View file @
eb968344
--
require
r
/
have_raid
.
require
disable_query_log
;
show
variables
like
"have_raid"
;
enable_query_log
;
#
# Test of raided tables
#
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
,
t2
;
DROP
DATABASE
IF
EXISTS
test_
$
1
;
--
enable_warnings
#
# Test dropping database with raid tables
#
create
database
test_
$
1
;
create
table
test_
$
1.
r1
(
i
int
)
raid_type
=
1
;
create
table
test_
$
1.
r2
(
i
int
)
raid_type
=
1
raid_chunks
=
32
;
drop
database
test_
$
1
;
#
# Bug #3182: Test using more than 257 raid chunks
#
create
database
test_
$
1
;
create
table
test_
$
1.
r2
(
i
int
)
raid_type
=
1
raid_chunks
=
257
;
show
create
table
test_
$
1.
r2
;
drop
database
test_
$
1
;
#
# Test that data is spread over different raid directories
#
CREATE
TABLE
t1
(
id
int
unsigned
not
null
auto_increment
primary
key
,
c
char
(
255
)
not
null
)
RAID_TYPE
=
STRIPED
RAID_CHUNKS
=
2
RAID_CHUNKSIZE
=
123
;
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
select
count
(
*
)
from
t1
;
ALTER
TABLE
t1
ADD
COLUMN
x
INT
UNSIGNED
NOT
NULL
;
ALTER
TABLE
t1
ADD
KEY
c
(
c
);
ALTER
TABLE
t1
DROP
KEY
c
;
ALTER
TABLE
t1
DROP
COLUMN
x
;
ALTER
TABLE
t1
RENAME
t2
;
select
count
(
*
)
from
t2
;
DROP
TABLE
t2
;
/* variable rows */
CREATE
TABLE
t1
(
id
int
unsigned
not
null
auto_increment
primary
key
,
c
varchar
(
255
)
not
null
)
RAID_TYPE
=
STRIPED
RAID_CHUNKS
=
5
RAID_CHUNKSIZE
=
121
;
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'1'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'p'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'b'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'q'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'c'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'r'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'd'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
's'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'e'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
't'
),(
NULL
,
'a'
),
(
NULL
,
'6'
),(
NULL
,
'f'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'u'
),(
NULL
,
'a'
),
(
NULL
,
'7'
),(
NULL
,
'g'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'v'
),(
NULL
,
'a'
),
(
NULL
,
'8'
),(
NULL
,
'h'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'w'
),(
NULL
,
'a'
),
(
NULL
,
'9'
),(
NULL
,
'i'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'x'
),(
NULL
,
'a'
),
(
NULL
,
'0'
),(
NULL
,
'j'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'y'
),(
NULL
,
'a'
),
(
NULL
,
'1'
),(
NULL
,
'k'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'z'
),(
NULL
,
'a'
),
(
NULL
,
'2'
),(
NULL
,
'l'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'/'
),(
NULL
,
'a'
),
(
NULL
,
'3'
),(
NULL
,
'm'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'*'
),(
NULL
,
'a'
),
(
NULL
,
'4'
),(
NULL
,
'n'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'+'
),(
NULL
,
'a'
),
(
NULL
,
'5'
),(
NULL
,
'o'
),(
NULL
,
'a'
),(
NULL
,
'a'
),(
NULL
,
'?'
),(
NULL
,
'a'
);
select
count
(
*
)
from
t1
;
ALTER
TABLE
t1
ADD
COLUMN
x
INT
UNSIGNED
NOT
NULL
;
ALTER
TABLE
t1
ADD
KEY
c
(
c
);
ALTER
TABLE
t1
DROP
KEY
c
;
ALTER
TABLE
t1
DROP
COLUMN
x
;
ALTER
TABLE
t1
RENAME
t2
;
ALTER
TABLE
t2
CHANGE
COLUMN
c
c
VARCHAR
(
251
)
NOT
NULL
;
select
count
(
*
)
from
t2
;
DROP
TABLE
t2
;
# End of 4.1 tests
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_heap.test
View file @
0c487a79
...
@@ -18,7 +18,7 @@ reset master;
...
@@ -18,7 +18,7 @@ reset master;
drop
table
if
exists
t1
;
drop
table
if
exists
t1
;
# we use CREATE SELECT to verify that DELETE does not get into binlog
# we use CREATE SELECT to verify that DELETE does not get into binlog
# before CREATE SELECT
# before CREATE SELECT
create
table
t1
typ
e
=
HEAP
select
10
as
a
;
create
table
t1
engin
e
=
HEAP
select
10
as
a
;
insert
into
t1
values
(
11
);
insert
into
t1
values
(
11
);
save_master_pos
;
save_master_pos
;
--
replace_column
2
# 5 #
--
replace_column
2
# 5 #
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/system_mysql_db_fix.test
View file @
0c487a79
...
@@ -38,7 +38,7 @@ CREATE TABLE db (
...
@@ -38,7 +38,7 @@ CREATE TABLE db (
PRIMARY
KEY
Host
(
Host
,
Db
,
User
),
PRIMARY
KEY
Host
(
Host
,
Db
,
User
),
KEY
User
(
User
)
KEY
User
(
User
)
)
)
typ
e
=
MyISAM
;
engin
e
=
MyISAM
;
--
enable
-
warnings
--
enable
-
warnings
INSERT
INTO
db
VALUES
(
'%'
,
'test'
,
''
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
);
INSERT
INTO
db
VALUES
(
'%'
,
'test'
,
''
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
);
...
@@ -56,7 +56,7 @@ CREATE TABLE host (
...
@@ -56,7 +56,7 @@ CREATE TABLE host (
Drop_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
,
Drop_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
,
PRIMARY
KEY
Host
(
Host
,
Db
)
PRIMARY
KEY
Host
(
Host
,
Db
)
)
)
typ
e
=
MyISAM
;
engin
e
=
MyISAM
;
--
enable
-
warnings
--
enable
-
warnings
--
disable_warnings
--
disable_warnings
...
@@ -75,7 +75,7 @@ CREATE TABLE user (
...
@@ -75,7 +75,7 @@ CREATE TABLE user (
Process_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
,
Process_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
,
PRIMARY
KEY
Host
(
Host
,
User
)
PRIMARY
KEY
Host
(
Host
,
User
)
)
)
typ
e
=
MyISAM
;
engin
e
=
MyISAM
;
--
enable
-
warnings
--
enable
-
warnings
INSERT
INTO
user
VALUES
(
'localhost'
,
'root'
,
''
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
);
INSERT
INTO
user
VALUES
(
'localhost'
,
'root'
,
''
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/warnings.test
View file @
0c487a79
...
@@ -117,14 +117,6 @@ drop table t1;
...
@@ -117,14 +117,6 @@ drop table t1;
#alter table t1 engine=isam;
#alter table t1 engine=isam;
#drop table t1;
#drop table t1;
#
# Test for deprecated TYPE= syntax
#
create
table
t1
(
id
int
)
type
=
heap
;
alter
table
t1
type
=
myisam
;
drop
table
t1
;
#
#
# Test for deprecated table_type variable
# Test for deprecated table_type variable
#
#
...
...
This diff is collapsed.
Click to expand it.
scripts/fill_func_tables.sh
View file @
0c487a79
...
@@ -140,7 +140,7 @@ print " max_args tinyint,";
...
@@ -140,7 +140,7 @@ print " max_args tinyint,";
print
" date_created datetime not null,"
;
print
" date_created datetime not null,"
;
print
" last_modified timestamp not null,"
;
print
" last_modified timestamp not null,"
;
print
" primary key (func_id)"
;
print
" primary key (func_id)"
;
print
")
type=myisam
;
\n\n
"
;
print
")
ENGINE=MYISAM
;
\n\n
"
;
print
"DROP TABLE IF EXISTS function_category_name;
\n
"
;
print
"DROP TABLE IF EXISTS function_category_name;
\n
"
;
print
"CREATE TABLE function_category_name ("
;
print
"CREATE TABLE function_category_name ("
;
...
@@ -150,14 +150,14 @@ print " url char(128) not null,";
...
@@ -150,14 +150,14 @@ print " url char(128) not null,";
print
" date_created datetime not null,"
;
print
" date_created datetime not null,"
;
print
" last_modified timestamp not null,"
;
print
" last_modified timestamp not null,"
;
print
" primary key (cat_id)"
;
print
" primary key (cat_id)"
;
print
")
type=myisam
;
\n\n
"
;
print
")
ENGINE=MYISAM
;
\n\n
"
;
print
"DROP TABLE IF EXISTS function_category;
\n
"
;
print
"DROP TABLE IF EXISTS function_category;
\n
"
;
print
"CREATE TABLE function_category ("
;
print
"CREATE TABLE function_category ("
;
print
" cat_id smallint unsigned not null references function_category_name,"
;
print
" cat_id smallint unsigned not null references function_category_name,"
;
print
" func_id int unsigned not null references function,"
;
print
" func_id int unsigned not null references function,"
;
print
" primary key (cat_id, func_id)"
;
print
" primary key (cat_id, func_id)"
;
print
")
type=myisam
;
\n\n
"
;
print
")
ENGINE=MYISAM
;
\n\n
"
;
print
"DELETE FROM function_category_name;
\n
"
;
print
"DELETE FROM function_category_name;
\n
"
;
print
"DELETE FROM function_category;
\n
"
;
print
"DELETE FROM function_category;
\n
"
;
...
...
This diff is collapsed.
Click to expand it.
scripts/mysql_convert_table_format.sh
View file @
0c487a79
...
@@ -69,7 +69,7 @@ foreach $table (@ARGV)
...
@@ -69,7 +69,7 @@ foreach $table (@ARGV)
}
}
}
}
print
"converting
$table
\n
"
if
(
$opt_verbose
)
;
print
"converting
$table
\n
"
if
(
$opt_verbose
)
;
if
(!
$dbh
->do
(
"ALTER TABLE
$table
type
=
$opt_type
"
))
if
(!
$dbh
->do
(
"ALTER TABLE
$table
ENGINE
=
$opt_type
"
))
{
{
print STDERR
"Can't convert
$table
: Error
$DBI
::errstr
\n
"
;
print STDERR
"Can't convert
$table
: Error
$DBI
::errstr
\n
"
;
exit
(
1
)
if
(!
$opt_force
)
;
exit
(
1
)
if
(!
$opt_force
)
;
...
@@ -114,7 +114,7 @@ Conversion of a MySQL tables to other table types.
...
@@ -114,7 +114,7 @@ Conversion of a MySQL tables to other table types.
--socket='/path/to/socket'
--socket='/path/to/socket'
Socket to connect with.
Socket to connect with.
--
type
='table-type'
--
ENGINE
='table-type'
Converts tables to the given table type (Default:
$opt_type
)
Converts tables to the given table type (Default:
$opt_type
)
MySQL 3.23 supports at least the BDB, ISAM and MYISAM types.
MySQL 3.23 supports at least the BDB, ISAM and MYISAM types.
...
...
This diff is collapsed.
Click to expand it.
sql/ha_innodb.cc
View file @
0c487a79
...
@@ -5761,7 +5761,7 @@ ha_innobase::analyze(
...
@@ -5761,7 +5761,7 @@ ha_innobase::analyze(
}
}
/**************************************************************************
/**************************************************************************
This is mapped to "ALTER TABLE tablename
TYP
E=InnoDB", which rebuilds
This is mapped to "ALTER TABLE tablename
ENGIN
E=InnoDB", which rebuilds
the table in MySQL. */
the table in MySQL. */
int
int
...
...
This diff is collapsed.
Click to expand it.
sql/sql_yacc.yy
View file @
0c487a79
...
@@ -3991,7 +3991,6 @@ create_table_options:
...
@@ -3991,7 +3991,6 @@ create_table_options:
create_table_option:
create_table_option:
ENGINE_SYM opt_equal storage_engines { Lex->create_info.db_type= $3; Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; }
ENGINE_SYM opt_equal storage_engines { Lex->create_info.db_type= $3; Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; }
| TYPE_SYM opt_equal storage_engines { Lex->create_info.db_type= $3; WARN_DEPRECATED("TYPE=storage_engine","ENGINE=storage_engine"); Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; }
| MAX_ROWS opt_equal ulonglong_num { Lex->create_info.max_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;}
| MAX_ROWS opt_equal ulonglong_num { Lex->create_info.max_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;}
| MIN_ROWS opt_equal ulonglong_num { Lex->create_info.min_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;}
| MIN_ROWS opt_equal ulonglong_num { Lex->create_info.min_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;}
| AVG_ROW_LENGTH opt_equal ulong_num { Lex->create_info.avg_row_length=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;}
| AVG_ROW_LENGTH opt_equal ulong_num { Lex->create_info.avg_row_length=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;}
...
...
This diff is collapsed.
Click to expand it.
tests/fork_big.pl
View file @
0c487a79
...
@@ -65,7 +65,7 @@ if (!$opt_skip_create)
...
@@ -65,7 +65,7 @@ if (!$opt_skip_create)
}
}
# Create the table we use to signal that we should end the test
# Create the table we use to signal that we should end the test
$dbh
->
do
("
drop table if exists
$abort_table
");
$dbh
->
do
("
drop table if exists
$abort_table
");
$dbh
->
do
("
create table
$abort_table
(id int(6) not null)
type
=heap
")
||
$dbh
->
do
("
create table
$abort_table
(id int(6) not null)
ENGINE
=heap
")
||
die
$
DBI::
errstr
;
die
$
DBI::
errstr
;
}
}
...
...
This diff is collapsed.
Click to expand it.
tests/fork_big2.pl
View file @
0c487a79
...
@@ -89,7 +89,7 @@ if (!$opt_skip_create)
...
@@ -89,7 +89,7 @@ if (!$opt_skip_create)
}
}
# Create the table we use to signal that we should end the test
# Create the table we use to signal that we should end the test
$dbh
->
do
("
drop table if exists
$abort_table
");
$dbh
->
do
("
drop table if exists
$abort_table
");
$dbh
->
do
("
create table
$abort_table
(id int(6) not null)
type
=heap
")
||
$dbh
->
do
("
create table
$abort_table
(id int(6) not null)
ENGINE
=heap
")
||
die
$
DBI::
errstr
;
die
$
DBI::
errstr
;
}
}
...
...
This diff is collapsed.
Click to expand it.
tests/mail_to_db.pl
View file @
0c487a79
...
@@ -253,7 +253,7 @@ CREATE TABLE my_mail
...
@@ -253,7 +253,7 @@ CREATE TABLE my_mail
KEY (message_id),
KEY (message_id),
KEY (in_reply_to),
KEY (in_reply_to),
PRIMARY KEY (mail_from, date, hash))
PRIMARY KEY (mail_from, date, hash))
TYP
E=MyISAM COMMENT=''
ENGIN
E=MyISAM COMMENT=''
EOF
EOF
$sth
=
$dbh
->
prepare
(
$query
)
or
die
$
DBI::
errstr
;
$sth
=
$dbh
->
prepare
(
$query
)
or
die
$
DBI::
errstr
;
$sth
->
execute
()
or
die
"
Couldn't create table:
$DBI
::errstr
\n
";
$sth
->
execute
()
or
die
"
Couldn't create table:
$DBI
::errstr
\n
";
...
...
This diff is collapsed.
Click to expand it.
tests/mysql_client_test.c
View file @
0c487a79
...
@@ -1201,7 +1201,7 @@ static void test_tran_bdb()
...
@@ -1201,7 +1201,7 @@ static void test_tran_bdb()
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
rc
=
mysql_query
(
mysql
,
"CREATE TABLE my_demo_transaction( "
rc
=
mysql_query
(
mysql
,
"CREATE TABLE my_demo_transaction( "
"col1 int , col2 varchar(30))
TYP
E= BDB"
);
"col1 int , col2 varchar(30))
ENGIN
E= BDB"
);
myquery
(
rc
);
myquery
(
rc
);
/* insert a row and commit the transaction */
/* insert a row and commit the transaction */
...
@@ -1274,7 +1274,7 @@ static void test_tran_innodb()
...
@@ -1274,7 +1274,7 @@ static void test_tran_innodb()
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
rc
=
mysql_query
(
mysql
,
"CREATE TABLE my_demo_transaction(col1 int, "
rc
=
mysql_query
(
mysql
,
"CREATE TABLE my_demo_transaction(col1 int, "
"col2 varchar(30))
TYP
E= InnoDB"
);
"col2 varchar(30))
ENGIN
E= InnoDB"
);
myquery
(
rc
);
myquery
(
rc
);
/* insert a row and commit the transaction */
/* insert a row and commit the transaction */
...
@@ -9798,7 +9798,7 @@ static void test_derived()
...
@@ -9798,7 +9798,7 @@ static void test_derived()
myquery
(
rc
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"create table t1 (id int(8), primary key (id)) \
rc
=
mysql_query
(
mysql
,
"create table t1 (id int(8), primary key (id)) \
TYP
E=InnoDB DEFAULT CHARSET=utf8"
);
ENGIN
E=InnoDB DEFAULT CHARSET=utf8"
);
myquery
(
rc
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"insert into t1 values (1)"
);
rc
=
mysql_query
(
mysql
,
"insert into t1 values (1)"
);
...
@@ -9846,16 +9846,16 @@ static void test_xjoin()
...
@@ -9846,16 +9846,16 @@ static void test_xjoin()
rc
=
mysql_query
(
mysql
,
"DROP TABLE IF EXISTS t1, t2, t3, t4"
);
rc
=
mysql_query
(
mysql
,
"DROP TABLE IF EXISTS t1, t2, t3, t4"
);
myquery
(
rc
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"create table t3 (id int(8), param1_id int(8), param2_id int(8))
TYP
E=InnoDB DEFAULT CHARSET=utf8"
);
rc
=
mysql_query
(
mysql
,
"create table t3 (id int(8), param1_id int(8), param2_id int(8))
ENGIN
E=InnoDB DEFAULT CHARSET=utf8"
);
myquery
(
rc
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"create table t1 ( id int(8), name_id int(8), value varchar(10))
TYP
E=InnoDB DEFAULT CHARSET=utf8"
);
rc
=
mysql_query
(
mysql
,
"create table t1 ( id int(8), name_id int(8), value varchar(10))
ENGIN
E=InnoDB DEFAULT CHARSET=utf8"
);
myquery
(
rc
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"create table t2 (id int(8), name_id int(8), value varchar(10))
TYP
E=InnoDB DEFAULT CHARSET=utf8;"
);
rc
=
mysql_query
(
mysql
,
"create table t2 (id int(8), name_id int(8), value varchar(10))
ENGIN
E=InnoDB DEFAULT CHARSET=utf8;"
);
myquery
(
rc
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"create table t4(id int(8), value varchar(10))
TYP
E=InnoDB DEFAULT CHARSET=utf8"
);
rc
=
mysql_query
(
mysql
,
"create table t4(id int(8), value varchar(10))
ENGIN
E=InnoDB DEFAULT CHARSET=utf8"
);
myquery
(
rc
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"insert into t3 values (1, 1, 1), (2, 2, null)"
);
rc
=
mysql_query
(
mysql
,
"insert into t3 values (1, 1, 1), (2, 2, null)"
);
...
@@ -14387,7 +14387,7 @@ static void test_bug14210()
...
@@ -14387,7 +14387,7 @@ static void test_bug14210()
itself is not InnoDB related. In case the table is MyISAM this test
itself is not InnoDB related. In case the table is MyISAM this test
is harmless.
is harmless.
*/
*/
mysql_query
(
mysql
,
"create table t1 (a varchar(255))
typ
e=InnoDB"
);
mysql_query
(
mysql
,
"create table t1 (a varchar(255))
engin
e=InnoDB"
);
rc
=
mysql_query
(
mysql
,
"insert into t1 (a) values (repeat('a', 256))"
);
rc
=
mysql_query
(
mysql
,
"insert into t1 (a) values (repeat('a', 256))"
);
myquery
(
rc
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"set @@session.max_heap_table_size=16384"
);
rc
=
mysql_query
(
mysql
,
"set @@session.max_heap_table_size=16384"
);
...
...
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