mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automerge from parent copy.

Browse source
This commit is contained in:
Joerg Bruehe 2010-06-18 10:29:03 +02:00
commit 105b4c38d0
52 changed files with 629 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mysql-test/lib/mtr_cases.pm
View file

@ -41,6 +41,12 @@ our $opt_with_ndbcluster_only;
our $defaults_file;
our $defaults_extra_file;
our $quick_collect;
# Set to 1 if you want the tests to override
# default storage engine settings, and use MyISAM
# as default. (temporary option used in connection
# with the change of default storage engine to InnoDB)
our $default_myisam= 1;
sub collect_option {
my ($opt, $value)= @_;
@ -591,6 +597,9 @@ sub optimize_cases {
my $default_engine=
mtr_match_prefix($opt, "--default-storage-engine=");
# Allow use of uppercase, convert to all lower case
$default_engine =~ tr/A-Z/a-z/;
if (defined $default_engine){
#print " $tinfo->{name}\n";
@ -948,10 +957,12 @@ sub collect_one_test_case {
return $tinfo unless $do_innodb_plugin;
}
}
else
elsif ($default_myisam)
{
push(@{$tinfo->{'master_opt'}}, "--loose-skip-innodb");
push(@{$tinfo->{'slave_opt'}}, "--loose-skip-innodb");
# This is a temporary fix to allow non-innodb tests to run even if
# the default storage engine is innodb.
push(@{$tinfo->{'master_opt'}}, "--default-storage-engine=MyISAM");
push(@{$tinfo->{'slave_opt'}}, "--default-storage-engine=MyISAM");
}
if ( $tinfo->{'need_binlog'} )

6
mysql-test/mysql-test-run.pl
View file

@ -944,6 +944,7 @@ sub command_line_setup {
'timestamp' => \&report_option,
'timediff' => \&report_option,
'max-connections=i' => \$opt_max_connections,
'default-myisam!' => \&collect_option,
'help|h' => \$opt_usage,
'list-options' => \$opt_list_options,
@ -2843,7 +2844,6 @@ sub mysql_install_db {
mtr_add_arg($args, "--bootstrap");
mtr_add_arg($args, "--basedir=%s", $install_basedir);
mtr_add_arg($args, "--datadir=%s", $install_datadir);
mtr_add_arg($args, "--loose-innodb=OFF");
mtr_add_arg($args, "--loose-skip-falcon");
mtr_add_arg($args, "--loose-skip-ndbcluster");
mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/");
@ -5560,7 +5560,9 @@ Misc options
timediff With --timestamp, also print time passed since
*previous* test started
max-connections=N Max number of open connection to server in mysqltest
default-myisam Set default storage engine to MyISAM for non-innodb
tests. This is needed after switching default storage
engine to InnoDB.
HERE
exit(1);

2
mysql-test/r/bug46760.result
View file

@ -25,7 +25,7 @@ DROP TABLE t1;
# MySQL Bug#39200: optimize table does not recognize
# ROW_FORMAT=COMPRESSED
#
CREATE TABLE t1 (a INT) ROW_FORMAT=compressed;
CREATE TABLE t1 (a INT) ROW_FORMAT=compressed, ENGINE=MyISAM;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (

2
mysql-test/r/mysqld--help-notwin.result
View file

@ -746,7 +746,7 @@ connect-timeout 10
console FALSE
date-format %Y-%m-%d
datetime-format %Y-%m-%d %H:%i:%s
default-storage-engine MyISAM
default-storage-engine InnoDB
default-time-zone (No default value)
default-week-format 0
delay-key-write ON

2
mysql-test/r/mysqld--help-win.result
View file

@ -750,7 +750,7 @@ connect-timeout 10
console FALSE
date-format %Y-%m-%d
datetime-format %Y-%m-%d %H:%i:%s
default-storage-engine MyISAM
default-storage-engine InnoDB
default-time-zone (No default value)
default-week-format 0
delay-key-write ON

4
mysql-test/r/partition_innodb.result
View file

@ -266,12 +266,12 @@ engine = x
partition by key (a);
Warnings:
Warning 1286 Unknown storage engine 'x'
Warning 1266 Using storage engine MyISAM for table 't1'
Warning 1266 Using storage engine InnoDB for table 't1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (a) */
drop table t1;
create table t1 (a int)

2
mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
View file

@ -1 +1 @@
--max_binlog_size=4096
--max_binlog_size=4096 --default-storage-engine=MyISAM

2
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
View file

@ -1 +1 @@
--innodb_lock_wait_timeout=2
--innodb_lock_wait_timeout=2 --default-storage-engine=MyISAM

2
mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
View file

@ -1 +1 @@
--max_binlog_size=4096
--max_binlog_size=4096 --default-storage-engine=MyISAM

2
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
View file

@ -1 +1 @@
--innodb_lock_wait_timeout=2 --binlog-direct-non-transactional-updates=FALSE
--innodb_lock_wait_timeout=2 --binlog-direct-non-transactional-updates=FALSE --default-storage-engine=MyISAM

2
mysql-test/suite/funcs_1/r/is_engines_innodb.result
View file

@ -1,7 +1,7 @@
SELECT * FROM information_schema.engines
WHERE ENGINE = 'InnoDB';
ENGINE InnoDB
SUPPORT YES
SUPPORT DEFAULT
COMMENT Supports transactions, row-level locking, and foreign keys
TRANSACTIONS YES
XA YES

4
mysql-test/suite/funcs_1/views/func_view.inc
View file

@ -171,7 +171,7 @@ CREATE TABLE t1_selects
disable_result ENUM('Yes','No') NOT NULL default 'No',
PRIMARY KEY(id),
UNIQUE (my_select)
);
) ENGINE=MyISAM;
# MODES to be checked
CREATE TABLE t1_modes
@ -180,7 +180,7 @@ CREATE TABLE t1_modes
my_mode VARCHAR(200) NOT NULL,
PRIMARY KEY(id),
UNIQUE (my_mode)
);
) ENGINE=MyISAM;
--enable_query_log
# The table to be used in the FROM parts of the SELECTs

6
mysql-test/suite/innodb/r/innodb-index.result
View file

@ -918,9 +918,9 @@ ERROR HY000: Too big row
alter table t1 row_format=compact;
create index t1u on t1 (u(1));
drop table t1;
set global innodb_file_per_table=0;
set global innodb_file_format=Antelope;
set global innodb_file_format_max=Antelope;
set global innodb_file_per_table=1;
set global innodb_file_format=Barracuda;
set global innodb_file_format_max=Barracuda;
SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
CREATE TABLE t1(

5
mysql-test/suite/innodb/r/innodb-zip.result
View file

@ -1,3 +1,4 @@
set session innodb_strict_mode=0;
set global innodb_file_per_table=off;
set global innodb_file_format=`0`;
create table t0(a int primary key) engine=innodb row_format=compressed;
@ -393,8 +394,8 @@ table_schema table_name row_format
test t8 Compact
test t9 Redundant
drop table t8, t9;
set global innodb_file_per_table=0;
set global innodb_file_format=Antelope;
set global innodb_file_per_table=1;
set global innodb_file_format=Barracuda;
set global innodb_file_per_table=on;
set global innodb_file_format=`Barracuda`;
set global innodb_file_format_max=`Antelope`;

4
mysql-test/suite/innodb/r/innodb_bug52745.result
View file

@ -125,6 +125,6 @@ Warning 1264 Out of range value for column 'col78' at row 1
Warning 1265 Data truncated for column 'col79' at row 1
Warning 1264 Out of range value for column 'col84' at row 1
DROP TABLE bug52745;
SET GLOBAL innodb_file_format=Antelope;
SET GLOBAL innodb_file_format=Barracuda;
SET GLOBAL innodb_file_format_max=Antelope;
SET GLOBAL innodb_file_per_table=0;
SET GLOBAL innodb_file_per_table=1;

4
mysql-test/suite/innodb/r/innodb_bug53591.result
View file

@ -11,6 +11,6 @@ Error 139 Too big row
Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
Error 1030 Got error 139 from storage engine
DROP TABLE bug53591;
SET GLOBAL innodb_file_format=Antelope;
SET GLOBAL innodb_file_format=Barracuda;
SET GLOBAL innodb_file_format_max=Antelope;
SET GLOBAL innodb_file_per_table=0;
SET GLOBAL innodb_file_per_table=1;

8
mysql-test/suite/innodb/r/innodb_file_format.result
View file

@ -1,6 +1,6 @@
select @@innodb_file_format;
@@innodb_file_format
Antelope
Barracuda
select @@innodb_file_format_check;
@@innodb_file_format_check
1
@ -17,14 +17,14 @@ Barracuda
set global innodb_file_format=default;
select @@innodb_file_format;
@@innodb_file_format
Antelope
Barracuda
set global innodb_file_format=on;
ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON'
set global innodb_file_format=off;
ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off'
select @@innodb_file_format;
@@innodb_file_format
Antelope
Barracuda
set global innodb_file_format_max=antelope;
set global innodb_file_format_max=barracuda;
set global innodb_file_format_max=cheetah;
@ -46,5 +46,5 @@ Antelope
set global innodb_file_format_max=antelope;
set global innodb_file_format_check=off;
ERROR HY000: Variable 'innodb_file_format_check' is a read only variable
SET GLOBAL innodb_file_format=Antelope;
SET GLOBAL innodb_file_format=Barracuda;
SET GLOBAL innodb_file_format_max=Antelope;

4
mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt
View file

@ -1 +1,3 @@
--innodb-use-sys-malloc=true
--default-storage-engine=MyISAM
--loose-innodb-use-sys-malloc=true
--loose-innodb-use-sys-malloc=true

6
mysql-test/suite/innodb/t/innodb-zip.test
View file

@ -3,9 +3,12 @@
let $per_table=`select @@innodb_file_per_table`;
let $format=`select @@innodb_file_format`;
let $innodb_file_format_max_orig=`select @@innodb_file_format_max`;
let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
set session innodb_strict_mode=0;
set global innodb_file_per_table=off;
set global innodb_file_format=`0`;
create table t0(a int primary key) engine=innodb row_format=compressed;
create table t00(a int primary key) engine=innodb
key_block_size=4 row_format=compressed;
@ -342,3 +345,4 @@ drop table normal_table, zip_table;
eval set global innodb_file_format=$format;
eval set global innodb_file_per_table=$per_table;
eval set global innodb_file_format_max=$innodb_file_format_max_orig;
eval set session innodb_strict_mode=$innodb_strict_mode_orig;

1
mysql-test/suite/innodb/t/innodb_bug47167.test
View file

@ -2,6 +2,7 @@
# It tests setting the global variable "innodb_file_format_max" (
# originally "innodb_file_format_check") with a user-Defined Variable.
--source include/not_embedded.inc
--source include/have_innodb.inc
# Save the value (Antelope) in 'innodb_file_format_max' to

1
mysql-test/suite/innodb/t/innodb_file_format.test
View file

@ -1,3 +1,4 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
let $innodb_file_format_orig=`select @@innodb_file_format`;

2
mysql-test/suite/innodb/t/innodb_mysql-master.opt
View file

@ -1 +1 @@
--innodb-lock-wait-timeout=2
--innodb-lock-wait-timeout=2 --default-storage-engine=MyISAM

94
mysql-test/suite/parts/r/partition_alter3_innodb.result
View file

@ -57,6 +57,7 @@ t1 CREATE TABLE `t1` (
`f_varchar` varchar(30) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
t1.frm
t1.ibd
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where
@ -78,6 +79,7 @@ t1 CREATE TABLE `t1` (
`f_varchar` varchar(30) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (YEAR(f_date)) */
t1#P#p0.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -96,6 +98,7 @@ t1 CREATE TABLE `t1` (
`f_varchar` varchar(30) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (DAYOFYEAR(f_date)) */
t1#P#p0.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -112,6 +115,7 @@ t1 CREATE TABLE `t1` (
`f_varchar` varchar(30) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (YEAR(f_date)) */
t1#P#p0.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -137,6 +141,9 @@ t1 CREATE TABLE `t1` (
(PARTITION p0 ENGINE = InnoDB,
PARTITION part1 ENGINE = InnoDB,
PARTITION part7 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -161,6 +168,10 @@ t1 CREATE TABLE `t1` (
PARTITION part1 ENGINE = InnoDB,
PARTITION part7 ENGINE = InnoDB,
PARTITION part2 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -186,6 +197,14 @@ t1 CREATE TABLE `t1` (
PARTITION p5 ENGINE = InnoDB,
PARTITION p6 ENGINE = InnoDB,
PARTITION p7 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#p4.ibd
t1#P#p5.ibd
t1#P#p6.ibd
t1#P#p7.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -222,6 +241,13 @@ t1 CREATE TABLE `t1` (
PARTITION p4 ENGINE = InnoDB,
PARTITION p5 ENGINE = InnoDB,
PARTITION p6 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#p4.ibd
t1#P#p5.ibd
t1#P#p6.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -244,6 +270,12 @@ t1 CREATE TABLE `t1` (
PARTITION part2 ENGINE = InnoDB,
PARTITION p4 ENGINE = InnoDB,
PARTITION p5 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#p4.ibd
t1#P#p5.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -265,6 +297,11 @@ t1 CREATE TABLE `t1` (
PARTITION part7 ENGINE = InnoDB,
PARTITION part2 ENGINE = InnoDB,
PARTITION p4 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#p4.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -285,6 +322,10 @@ t1 CREATE TABLE `t1` (
PARTITION part1 ENGINE = InnoDB,
PARTITION part7 ENGINE = InnoDB,
PARTITION part2 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -304,6 +345,9 @@ t1 CREATE TABLE `t1` (
(PARTITION p0 ENGINE = InnoDB,
PARTITION part1 ENGINE = InnoDB,
PARTITION part7 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -322,6 +366,8 @@ t1 CREATE TABLE `t1` (
/*!50100 PARTITION BY HASH (YEAR(f_date))
(PARTITION p0 ENGINE = InnoDB,
PARTITION part1 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -339,6 +385,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (YEAR(f_date))
(PARTITION p0 ENGINE = InnoDB) */
t1#P#p0.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
@ -359,6 +406,7 @@ t1 CREATE TABLE `t1` (
`f_varchar` varchar(30) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
t1.frm
t1.ibd
EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where
@ -398,6 +446,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
t1.frm
t1.ibd
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where
@ -420,6 +469,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (f_int1) */
t1#P#p0.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -448,6 +498,9 @@ t1 CREATE TABLE `t1` (
(PARTITION p0 ENGINE = InnoDB,
PARTITION part1 ENGINE = InnoDB,
PARTITION part7 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -472,6 +525,10 @@ t1 CREATE TABLE `t1` (
PARTITION part1 ENGINE = InnoDB,
PARTITION part7 ENGINE = InnoDB,
PARTITION part2 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -500,6 +557,14 @@ t1 CREATE TABLE `t1` (
PARTITION p5 ENGINE = InnoDB,
PARTITION p6 ENGINE = InnoDB,
PARTITION p7 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#p4.ibd
t1#P#p5.ibd
t1#P#p6.ibd
t1#P#p7.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -534,6 +599,13 @@ t1 CREATE TABLE `t1` (
PARTITION p4 ENGINE = InnoDB,
PARTITION p5 ENGINE = InnoDB,
PARTITION p6 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#p4.ibd
t1#P#p5.ibd
t1#P#p6.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -559,6 +631,12 @@ t1 CREATE TABLE `t1` (
PARTITION part2 ENGINE = InnoDB,
PARTITION p4 ENGINE = InnoDB,
PARTITION p5 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#p4.ibd
t1#P#p5.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -583,6 +661,11 @@ t1 CREATE TABLE `t1` (
PARTITION part7 ENGINE = InnoDB,
PARTITION part2 ENGINE = InnoDB,
PARTITION p4 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#p4.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -606,6 +689,10 @@ t1 CREATE TABLE `t1` (
PARTITION part1 ENGINE = InnoDB,
PARTITION part7 ENGINE = InnoDB,
PARTITION part2 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -628,6 +715,9 @@ t1 CREATE TABLE `t1` (
(PARTITION p0 ENGINE = InnoDB,
PARTITION part1 ENGINE = InnoDB,
PARTITION part7 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1#P#part7.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -649,6 +739,8 @@ t1 CREATE TABLE `t1` (
/*!50100 PARTITION BY KEY (f_int1)
(PARTITION p0 ENGINE = InnoDB,
PARTITION part1 ENGINE = InnoDB) */
t1#P#p0.ibd
t1#P#part1.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -669,6 +761,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (f_int1)
(PARTITION p0 ENGINE = InnoDB) */
t1#P#p0.ibd
t1.frm
t1.par
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@ -692,6 +785,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
t1.frm
t1.ibd
EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where

432
mysql-test/suite/parts/r/partition_basic_innodb.result
View file

@ -77,6 +77,8 @@ t1 CREATE TABLE `t1` (
PARTITIONS 2 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1.frm
t1.par
@ -532,6 +534,11 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1#P#p2.ibd
t1#P#p3.ibd
t1#P#p4.ibd
t1.frm
t1.par
@ -1002,6 +1009,14 @@ t1 CREATE TABLE `t1` (
PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
unified filelist
t1#P#part0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part3.ibd
t1#P#part_1.ibd
t1#P#part_2.ibd
t1#P#part_3.ibd
t1#P#part_N.ibd
t1.frm
t1.par
@ -1468,6 +1483,12 @@ t1 CREATE TABLE `t1` (
PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta.ibd
t1#P#partb.ibd
t1#P#partc.ibd
t1#P#partd.ibd
t1#P#parte.ibd
t1#P#partf.ibd
t1.frm
t1.par
@ -1930,6 +1951,14 @@ SUBPARTITIONS 2
PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta#SP#partasp0.ibd
t1#P#parta#SP#partasp1.ibd
t1#P#partb#SP#partbsp0.ibd
t1#P#partb#SP#partbsp1.ibd
t1#P#partc#SP#partcsp0.ibd
t1#P#partc#SP#partcsp1.ibd
t1#P#partd#SP#partdsp0.ibd
t1#P#partd#SP#partdsp1.ibd
t1.frm
t1.par
@ -2405,6 +2434,14 @@ SUBPARTITION BY KEY (f_int1)
SUBPARTITION subpart42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#subpart11.ibd
t1#P#part1#SP#subpart12.ibd
t1#P#part2#SP#subpart21.ibd
t1#P#part2#SP#subpart22.ibd
t1#P#part3#SP#subpart31.ibd
t1#P#part3#SP#subpart32.ibd
t1#P#part4#SP#subpart41.ibd
t1#P#part4#SP#subpart42.ibd
t1.frm
t1.par
@ -2882,6 +2919,14 @@ SUBPARTITION BY HASH (f_int1 + 1)
SUBPARTITION sp42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#sp11.ibd
t1#P#part1#SP#sp12.ibd
t1#P#part2#SP#sp21.ibd
t1#P#part2#SP#sp22.ibd
t1#P#part3#SP#sp31.ibd
t1#P#part3#SP#sp32.ibd
t1#P#part4#SP#sp41.ibd
t1#P#part4#SP#sp42.ibd
t1.frm
t1.par
@ -3345,6 +3390,15 @@ SUBPARTITIONS 3
PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
unified filelist
t1#P#part1#SP#part1sp0.ibd
t1#P#part1#SP#part1sp1.ibd
t1#P#part1#SP#part1sp2.ibd
t1#P#part2#SP#part2sp0.ibd
t1#P#part2#SP#part2sp1.ibd
t1#P#part2#SP#part2sp2.ibd
t1#P#part3#SP#part3sp0.ibd
t1#P#part3#SP#part3sp1.ibd
t1#P#part3#SP#part3sp2.ibd
t1.frm
t1.par
@ -3802,6 +3856,8 @@ t1 CREATE TABLE `t1` (
PARTITIONS 2 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1.frm
t1.par
@ -4257,6 +4313,11 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1#P#p2.ibd
t1#P#p3.ibd
t1#P#p4.ibd
t1.frm
t1.par
@ -4727,6 +4788,14 @@ t1 CREATE TABLE `t1` (
PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
unified filelist
t1#P#part0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part3.ibd
t1#P#part_1.ibd
t1#P#part_2.ibd
t1#P#part_3.ibd
t1#P#part_N.ibd
t1.frm
t1.par
@ -5193,6 +5262,12 @@ t1 CREATE TABLE `t1` (
PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta.ibd
t1#P#partb.ibd
t1#P#partc.ibd
t1#P#partd.ibd
t1#P#parte.ibd
t1#P#partf.ibd
t1.frm
t1.par
@ -5655,6 +5730,14 @@ SUBPARTITIONS 2
PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta#SP#partasp0.ibd
t1#P#parta#SP#partasp1.ibd
t1#P#partb#SP#partbsp0.ibd
t1#P#partb#SP#partbsp1.ibd
t1#P#partc#SP#partcsp0.ibd
t1#P#partc#SP#partcsp1.ibd
t1#P#partd#SP#partdsp0.ibd
t1#P#partd#SP#partdsp1.ibd
t1.frm
t1.par
@ -6128,6 +6211,14 @@ SUBPARTITION BY KEY (f_int2)
SUBPARTITION subpart42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#subpart11.ibd
t1#P#part1#SP#subpart12.ibd
t1#P#part2#SP#subpart21.ibd
t1#P#part2#SP#subpart22.ibd
t1#P#part3#SP#subpart31.ibd
t1#P#part3#SP#subpart32.ibd
t1#P#part4#SP#subpart41.ibd
t1#P#part4#SP#subpart42.ibd
t1.frm
t1.par
@ -6601,6 +6692,14 @@ SUBPARTITION BY HASH (f_int2 + 1)
SUBPARTITION sp42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#sp11.ibd
t1#P#part1#SP#sp12.ibd
t1#P#part2#SP#sp21.ibd
t1#P#part2#SP#sp22.ibd
t1#P#part3#SP#sp31.ibd
t1#P#part3#SP#sp32.ibd
t1#P#part4#SP#sp41.ibd
t1#P#part4#SP#sp42.ibd
t1.frm
t1.par
@ -7064,6 +7163,15 @@ SUBPARTITIONS 3
PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
unified filelist
t1#P#part1#SP#part1sp0.ibd
t1#P#part1#SP#part1sp1.ibd
t1#P#part1#SP#part1sp2.ibd
t1#P#part2#SP#part2sp0.ibd
t1#P#part2#SP#part2sp1.ibd
t1#P#part2#SP#part2sp2.ibd
t1#P#part3#SP#part3sp0.ibd
t1#P#part3#SP#part3sp1.ibd
t1#P#part3#SP#part3sp2.ibd
t1.frm
t1.par
@ -7527,6 +7635,8 @@ t1 CREATE TABLE `t1` (
PARTITIONS 2 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1.frm
t1.par
@ -8019,6 +8129,11 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1#P#p2.ibd
t1#P#p3.ibd
t1#P#p4.ibd
t1.frm
t1.par
@ -8526,6 +8641,14 @@ t1 CREATE TABLE `t1` (
PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
unified filelist
t1#P#part0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part3.ibd
t1#P#part_1.ibd
t1#P#part_2.ibd
t1#P#part_3.ibd
t1#P#part_N.ibd
t1.frm
t1.par
@ -9029,6 +9152,12 @@ t1 CREATE TABLE `t1` (
PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta.ibd
t1#P#partb.ibd
t1#P#partc.ibd
t1#P#partd.ibd
t1#P#parte.ibd
t1#P#partf.ibd
t1.frm
t1.par
@ -9528,6 +9657,14 @@ SUBPARTITIONS 2
PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta#SP#partasp0.ibd
t1#P#parta#SP#partasp1.ibd
t1#P#partb#SP#partbsp0.ibd
t1#P#partb#SP#partbsp1.ibd
t1#P#partc#SP#partcsp0.ibd
t1#P#partc#SP#partcsp1.ibd
t1#P#partd#SP#partdsp0.ibd
t1#P#partd#SP#partdsp1.ibd
t1.frm
t1.par
@ -10040,6 +10177,14 @@ SUBPARTITION BY KEY (f_int1)
SUBPARTITION subpart42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#subpart11.ibd
t1#P#part1#SP#subpart12.ibd
t1#P#part2#SP#subpart21.ibd
t1#P#part2#SP#subpart22.ibd
t1#P#part3#SP#subpart31.ibd
t1#P#part3#SP#subpart32.ibd
t1#P#part4#SP#subpart41.ibd
t1#P#part4#SP#subpart42.ibd
t1.frm
t1.par
@ -10554,6 +10699,14 @@ SUBPARTITION BY HASH (f_int1 + 1)
SUBPARTITION sp42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#sp11.ibd
t1#P#part1#SP#sp12.ibd
t1#P#part2#SP#sp21.ibd
t1#P#part2#SP#sp22.ibd
t1#P#part3#SP#sp31.ibd
t1#P#part3#SP#sp32.ibd
t1#P#part4#SP#sp41.ibd
t1#P#part4#SP#sp42.ibd
t1.frm
t1.par
@ -11054,6 +11207,15 @@ SUBPARTITIONS 3
PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
unified filelist
t1#P#part1#SP#part1sp0.ibd
t1#P#part1#SP#part1sp1.ibd
t1#P#part1#SP#part1sp2.ibd
t1#P#part2#SP#part2sp0.ibd
t1#P#part2#SP#part2sp1.ibd
t1#P#part2#SP#part2sp2.ibd
t1#P#part3#SP#part3sp0.ibd
t1#P#part3#SP#part3sp1.ibd
t1#P#part3#SP#part3sp2.ibd
t1.frm
t1.par
@ -11547,6 +11709,8 @@ t1 CREATE TABLE `t1` (
PARTITIONS 2 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1.frm
t1.par
@ -12039,6 +12203,11 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1#P#p2.ibd
t1#P#p3.ibd
t1#P#p4.ibd
t1.frm
t1.par
@ -12546,6 +12715,14 @@ t1 CREATE TABLE `t1` (
PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
unified filelist
t1#P#part0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part3.ibd
t1#P#part_1.ibd
t1#P#part_2.ibd
t1#P#part_3.ibd
t1#P#part_N.ibd
t1.frm
t1.par
@ -13049,6 +13226,12 @@ t1 CREATE TABLE `t1` (
PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta.ibd
t1#P#partb.ibd
t1#P#partc.ibd
t1#P#partd.ibd
t1#P#parte.ibd
t1#P#partf.ibd
t1.frm
t1.par
@ -13548,6 +13731,14 @@ SUBPARTITIONS 2
PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta#SP#partasp0.ibd
t1#P#parta#SP#partasp1.ibd
t1#P#partb#SP#partbsp0.ibd
t1#P#partb#SP#partbsp1.ibd
t1#P#partc#SP#partcsp0.ibd
t1#P#partc#SP#partcsp1.ibd
t1#P#partd#SP#partdsp0.ibd
t1#P#partd#SP#partdsp1.ibd
t1.frm
t1.par
@ -14060,6 +14251,14 @@ SUBPARTITION BY KEY (f_int1)
SUBPARTITION subpart42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#subpart11.ibd
t1#P#part1#SP#subpart12.ibd
t1#P#part2#SP#subpart21.ibd
t1#P#part2#SP#subpart22.ibd
t1#P#part3#SP#subpart31.ibd
t1#P#part3#SP#subpart32.ibd
t1#P#part4#SP#subpart41.ibd
t1#P#part4#SP#subpart42.ibd
t1.frm
t1.par
@ -14574,6 +14773,14 @@ SUBPARTITION BY HASH (f_int1 + 1)
SUBPARTITION sp42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#sp11.ibd
t1#P#part1#SP#sp12.ibd
t1#P#part2#SP#sp21.ibd
t1#P#part2#SP#sp22.ibd
t1#P#part3#SP#sp31.ibd
t1#P#part3#SP#sp32.ibd
t1#P#part4#SP#sp41.ibd
t1#P#part4#SP#sp42.ibd
t1.frm
t1.par
@ -15074,6 +15281,15 @@ SUBPARTITIONS 3
PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
unified filelist
t1#P#part1#SP#part1sp0.ibd
t1#P#part1#SP#part1sp1.ibd
t1#P#part1#SP#part1sp2.ibd
t1#P#part2#SP#part2sp0.ibd
t1#P#part2#SP#part2sp1.ibd
t1#P#part2#SP#part2sp2.ibd
t1#P#part3#SP#part3sp0.ibd
t1#P#part3#SP#part3sp1.ibd
t1#P#part3#SP#part3sp2.ibd
t1.frm
t1.par
@ -15567,6 +15783,8 @@ t1 CREATE TABLE `t1` (
PARTITIONS 2 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1.frm
t1.par
@ -16075,6 +16293,11 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1#P#p2.ibd
t1#P#p3.ibd
t1#P#p4.ibd
t1.frm
t1.par
@ -16598,6 +16821,14 @@ t1 CREATE TABLE `t1` (
PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
unified filelist
t1#P#part0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part3.ibd
t1#P#part_1.ibd
t1#P#part_2.ibd
t1#P#part_3.ibd
t1#P#part_N.ibd
t1.frm
t1.par
@ -17117,6 +17348,12 @@ t1 CREATE TABLE `t1` (
PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta.ibd
t1#P#partb.ibd
t1#P#partc.ibd
t1#P#partd.ibd
t1#P#parte.ibd
t1#P#partf.ibd
t1.frm
t1.par
@ -17632,6 +17869,14 @@ SUBPARTITIONS 2
PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta#SP#partasp0.ibd
t1#P#parta#SP#partasp1.ibd
t1#P#partb#SP#partbsp0.ibd
t1#P#partb#SP#partbsp1.ibd
t1#P#partc#SP#partcsp0.ibd
t1#P#partc#SP#partcsp1.ibd
t1#P#partd#SP#partdsp0.ibd
t1#P#partd#SP#partdsp1.ibd
t1.frm
t1.par
@ -18160,6 +18405,14 @@ SUBPARTITION BY KEY (f_int1)
SUBPARTITION subpart42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#subpart11.ibd
t1#P#part1#SP#subpart12.ibd
t1#P#part2#SP#subpart21.ibd
t1#P#part2#SP#subpart22.ibd
t1#P#part3#SP#subpart31.ibd
t1#P#part3#SP#subpart32.ibd
t1#P#part4#SP#subpart41.ibd
t1#P#part4#SP#subpart42.ibd
t1.frm
t1.par
@ -18690,6 +18943,14 @@ SUBPARTITION BY HASH (f_int1 + 1)
SUBPARTITION sp42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#sp11.ibd
t1#P#part1#SP#sp12.ibd
t1#P#part2#SP#sp21.ibd
t1#P#part2#SP#sp22.ibd
t1#P#part3#SP#sp31.ibd
t1#P#part3#SP#sp32.ibd
t1#P#part4#SP#sp41.ibd
t1#P#part4#SP#sp42.ibd
t1.frm
t1.par
@ -19206,6 +19467,15 @@ SUBPARTITIONS 3
PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
unified filelist
t1#P#part1#SP#part1sp0.ibd
t1#P#part1#SP#part1sp1.ibd
t1#P#part1#SP#part1sp2.ibd
t1#P#part2#SP#part2sp0.ibd
t1#P#part2#SP#part2sp1.ibd
t1#P#part2#SP#part2sp2.ibd
t1#P#part3#SP#part3sp0.ibd
t1#P#part3#SP#part3sp1.ibd
t1#P#part3#SP#part3sp2.ibd
t1.frm
t1.par
@ -19720,6 +19990,8 @@ t1 CREATE TABLE `t1` (
PARTITIONS 2 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1.frm
t1.par
@ -20212,6 +20484,11 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1#P#p2.ibd
t1#P#p3.ibd
t1#P#p4.ibd
t1.frm
t1.par
@ -20719,6 +20996,14 @@ t1 CREATE TABLE `t1` (
PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
unified filelist
t1#P#part0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part3.ibd
t1#P#part_1.ibd
t1#P#part_2.ibd
t1#P#part_3.ibd
t1#P#part_N.ibd
t1.frm
t1.par
@ -21222,6 +21507,12 @@ t1 CREATE TABLE `t1` (
PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta.ibd
t1#P#partb.ibd
t1#P#partc.ibd
t1#P#partd.ibd
t1#P#parte.ibd
t1#P#partf.ibd
t1.frm
t1.par
@ -21721,6 +22012,14 @@ SUBPARTITIONS 2
PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta#SP#partasp0.ibd
t1#P#parta#SP#partasp1.ibd
t1#P#partb#SP#partbsp0.ibd
t1#P#partb#SP#partbsp1.ibd
t1#P#partc#SP#partcsp0.ibd
t1#P#partc#SP#partcsp1.ibd
t1#P#partd#SP#partdsp0.ibd
t1#P#partd#SP#partdsp1.ibd
t1.frm
t1.par
@ -22231,6 +22530,14 @@ SUBPARTITION BY KEY (f_int2)
SUBPARTITION subpart42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#subpart11.ibd
t1#P#part1#SP#subpart12.ibd
t1#P#part2#SP#subpart21.ibd
t1#P#part2#SP#subpart22.ibd
t1#P#part3#SP#subpart31.ibd
t1#P#part3#SP#subpart32.ibd
t1#P#part4#SP#subpart41.ibd
t1#P#part4#SP#subpart42.ibd
t1.frm
t1.par
@ -22741,6 +23048,14 @@ SUBPARTITION BY HASH (f_int2 + 1)
SUBPARTITION sp42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#sp11.ibd
t1#P#part1#SP#sp12.ibd
t1#P#part2#SP#sp21.ibd
t1#P#part2#SP#sp22.ibd
t1#P#part3#SP#sp31.ibd
t1#P#part3#SP#sp32.ibd
t1#P#part4#SP#sp41.ibd
t1#P#part4#SP#sp42.ibd
t1.frm
t1.par
@ -23241,6 +23556,15 @@ SUBPARTITIONS 3
PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
unified filelist
t1#P#part1#SP#part1sp0.ibd
t1#P#part1#SP#part1sp1.ibd
t1#P#part1#SP#part1sp2.ibd
t1#P#part2#SP#part2sp0.ibd
t1#P#part2#SP#part2sp1.ibd
t1#P#part2#SP#part2sp2.ibd
t1#P#part3#SP#part3sp0.ibd
t1#P#part3#SP#part3sp1.ibd
t1#P#part3#SP#part3sp2.ibd
t1.frm
t1.par
@ -23734,6 +24058,8 @@ t1 CREATE TABLE `t1` (
PARTITIONS 2 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1.frm
t1.par
@ -24226,6 +24552,11 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1#P#p2.ibd
t1#P#p3.ibd
t1#P#p4.ibd
t1.frm
t1.par
@ -24733,6 +25064,14 @@ t1 CREATE TABLE `t1` (
PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
unified filelist
t1#P#part0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part3.ibd
t1#P#part_1.ibd
t1#P#part_2.ibd
t1#P#part_3.ibd
t1#P#part_N.ibd
t1.frm
t1.par
@ -25236,6 +25575,12 @@ t1 CREATE TABLE `t1` (
PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta.ibd
t1#P#partb.ibd
t1#P#partc.ibd
t1#P#partd.ibd
t1#P#parte.ibd
t1#P#partf.ibd
t1.frm
t1.par
@ -25735,6 +26080,14 @@ SUBPARTITIONS 2
PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta#SP#partasp0.ibd
t1#P#parta#SP#partasp1.ibd
t1#P#partb#SP#partbsp0.ibd
t1#P#partb#SP#partbsp1.ibd
t1#P#partc#SP#partcsp0.ibd
t1#P#partc#SP#partcsp1.ibd
t1#P#partd#SP#partdsp0.ibd
t1#P#partd#SP#partdsp1.ibd
t1.frm
t1.par
@ -26245,6 +26598,14 @@ SUBPARTITION BY KEY (f_int2)
SUBPARTITION subpart42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#subpart11.ibd
t1#P#part1#SP#subpart12.ibd
t1#P#part2#SP#subpart21.ibd
t1#P#part2#SP#subpart22.ibd
t1#P#part3#SP#subpart31.ibd
t1#P#part3#SP#subpart32.ibd
t1#P#part4#SP#subpart41.ibd
t1#P#part4#SP#subpart42.ibd
t1.frm
t1.par
@ -26755,6 +27116,14 @@ SUBPARTITION BY HASH (f_int2 + 1)
SUBPARTITION sp42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#sp11.ibd
t1#P#part1#SP#sp12.ibd
t1#P#part2#SP#sp21.ibd
t1#P#part2#SP#sp22.ibd
t1#P#part3#SP#sp31.ibd
t1#P#part3#SP#sp32.ibd
t1#P#part4#SP#sp41.ibd
t1#P#part4#SP#sp42.ibd
t1.frm
t1.par
@ -27255,6 +27624,15 @@ SUBPARTITIONS 3
PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
unified filelist
t1#P#part1#SP#part1sp0.ibd
t1#P#part1#SP#part1sp1.ibd
t1#P#part1#SP#part1sp2.ibd
t1#P#part2#SP#part2sp0.ibd
t1#P#part2#SP#part2sp1.ibd
t1#P#part2#SP#part2sp2.ibd
t1#P#part3#SP#part3sp0.ibd
t1#P#part3#SP#part3sp1.ibd
t1#P#part3#SP#part3sp2.ibd
t1.frm
t1.par
@ -27748,6 +28126,8 @@ t1 CREATE TABLE `t1` (
PARTITIONS 2 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1.frm
t1.par
@ -28256,6 +28636,11 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */
unified filelist
t1#P#p0.ibd
t1#P#p1.ibd
t1#P#p2.ibd
t1#P#p3.ibd
t1#P#p4.ibd
t1.frm
t1.par
@ -28779,6 +29164,14 @@ t1 CREATE TABLE `t1` (
PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
unified filelist
t1#P#part0.ibd
t1#P#part1.ibd
t1#P#part2.ibd
t1#P#part3.ibd
t1#P#part_1.ibd
t1#P#part_2.ibd
t1#P#part_3.ibd
t1#P#part_N.ibd
t1.frm
t1.par
@ -29298,6 +29691,12 @@ t1 CREATE TABLE `t1` (
PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta.ibd
t1#P#partb.ibd
t1#P#partc.ibd
t1#P#partd.ibd
t1#P#parte.ibd
t1#P#partf.ibd
t1.frm
t1.par
@ -29813,6 +30212,14 @@ SUBPARTITIONS 2
PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
unified filelist
t1#P#parta#SP#partasp0.ibd
t1#P#parta#SP#partasp1.ibd
t1#P#partb#SP#partbsp0.ibd
t1#P#partb#SP#partbsp1.ibd
t1#P#partc#SP#partcsp0.ibd
t1#P#partc#SP#partcsp1.ibd
t1#P#partd#SP#partdsp0.ibd
t1#P#partd#SP#partdsp1.ibd
t1.frm
t1.par
@ -30339,6 +30746,14 @@ SUBPARTITION BY KEY (f_int2)
SUBPARTITION subpart42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#subpart11.ibd
t1#P#part1#SP#subpart12.ibd
t1#P#part2#SP#subpart21.ibd
t1#P#part2#SP#subpart22.ibd
t1#P#part3#SP#subpart31.ibd
t1#P#part3#SP#subpart32.ibd
t1#P#part4#SP#subpart41.ibd
t1#P#part4#SP#subpart42.ibd
t1.frm
t1.par
@ -30865,6 +31280,14 @@ SUBPARTITION BY HASH (f_int2 + 1)
SUBPARTITION sp42 ENGINE = InnoDB)) */
unified filelist
t1#P#part1#SP#sp11.ibd
t1#P#part1#SP#sp12.ibd
t1#P#part2#SP#sp21.ibd
t1#P#part2#SP#sp22.ibd
t1#P#part3#SP#sp31.ibd
t1#P#part3#SP#sp32.ibd
t1#P#part4#SP#sp41.ibd
t1#P#part4#SP#sp42.ibd
t1.frm
t1.par
@ -31381,6 +31804,15 @@ SUBPARTITIONS 3
PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
unified filelist
t1#P#part1#SP#part1sp0.ibd
t1#P#part1#SP#part1sp1.ibd
t1#P#part1#SP#part1sp2.ibd
t1#P#part2#SP#part2sp0.ibd
t1#P#part2#SP#part2sp1.ibd
t1#P#part2#SP#part2sp2.ibd
t1#P#part3#SP#part3sp0.ibd
t1#P#part3#SP#part3sp1.ibd
t1#P#part3#SP#part3sp2.ibd
t1.frm
t1.par

4
mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result
View file

@ -7,11 +7,11 @@ master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (c1 char(50))
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Xid # # COMMIT /* XID */
DROP TABLE t1;
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

8
mysql-test/suite/rpl/r/rpl_slave_skip.result
View file

@ -8,15 +8,15 @@ start slave;
STOP SLAVE;
**** On Master ****
SET SESSION BINLOG_FORMAT=ROW;
CREATE TABLE t1 (a INT, b INT);
CREATE TABLE t2 (c INT, d INT);
CREATE TABLE t1 (a INT, b INT) ENGINE=MyISAM;
CREATE TABLE t2 (c INT, d INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1,1),(2,4),(3,9);
INSERT INTO t2 VALUES (1,1),(2,8),(3,27);
UPDATE t1,t2 SET b = d, d = b * 2 WHERE a = c;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b INT)
master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (c INT, d INT)
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b INT) ENGINE=MyISAM
master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (c INT, d INT) ENGINE=MyISAM
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F

2
mysql-test/suite/rpl/r/rpl_stm_innodb.result
View file

@ -66,7 +66,7 @@ SHOW CREATE TABLE mysqltest1.tmp2;
Table Create Table
tmp2 CREATE TEMPORARY TABLE `tmp2` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1
######### Must return no rows here #########
SELECT COUNT(*) FROM mysqltest1.t1;
COUNT(*)

4
mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
View file

@ -1,10 +1,10 @@
RESET MASTER;
CREATE TABLE t1 (c1 char(50));
CREATE TABLE t1 (c1 char(50)) ENGINE=MyISAM;
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
LOAD DATA CONCURRENT INFILE '../../std_data/words.dat' INTO TABLE t1;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (c1 char(50))
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (c1 char(50)) ENGINE=MyISAM
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`c1`) ;file_id=#

2
mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt
View file

@ -1,2 +1,2 @@
--binlog_ignore_db=test_ignore
--binlog_ignore_db=test_ignore --default-storage-engine=MyISAM

2
mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size-master.opt
View file

@ -1 +1 @@
--binlog_cache_size=4096 --max_binlog_cache_size=7680
--binlog_cache_size=4096 --max_binlog_cache_size=7680 --default-storage-engine=MyISAM

4
mysql-test/suite/rpl/t/rpl_slave_skip.test
View file

@ -17,8 +17,8 @@ STOP SLAVE;
connection master;
SET SESSION BINLOG_FORMAT=ROW;
CREATE TABLE t1 (a INT, b INT);
CREATE TABLE t2 (c INT, d INT);
CREATE TABLE t1 (a INT, b INT) ENGINE=MyISAM;
CREATE TABLE t2 (c INT, d INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1,1),(2,4),(3,9);
INSERT INTO t2 VALUES (1,1),(2,8),(3,27);
let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1);

2
mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test
View file

@ -4,7 +4,7 @@
RESET MASTER;
let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
CREATE TABLE t1 (c1 char(50));
CREATE TABLE t1 (c1 char(50)) ENGINE=MyISAM;
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
LOAD DATA CONCURRENT INFILE '../../std_data/words.dat' INTO TABLE t1;
-- source include/show_binlog_events.inc

12
mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
View file

@ -1,22 +1,22 @@
SET @start_global_value = @@global.default_storage_engine;
SELECT @start_global_value;
@start_global_value
MyISAM
InnoDB
SET @start_session_value = @@session.default_storage_engine;
SELECT @start_session_value;
@start_session_value
MyISAM
InnoDB
'#--------------------FN_DYNVARS_005_01-------------------------#'
SET @@global.default_storage_engine = INNODB;
SET @@global.default_storage_engine = DEFAULT;
SELECT @@global.default_storage_engine;
@@global.default_storage_engine
MyISAM
InnoDB
SET @@session.default_storage_engine = INNODB;
SET @@session.default_storage_engine = DEFAULT;
SELECT @@session.default_storage_engine;
@@session.default_storage_engine
MyISAM
InnoDB
'#--------------------FN_DYNVARS_005_02-------------------------#'
SET @@global.default_storage_engine = MYISAM;
SELECT @@global.default_storage_engine;
@ -110,8 +110,8 @@ SET @@default_storage_engine = @start_global_value;
SET @@global.default_storage_engine = @start_global_value;
SELECT @@global.default_storage_engine;
@@global.default_storage_engine
MyISAM
InnoDB
SET @@session.default_storage_engine = @start_session_value;
SELECT @@session.default_storage_engine;
@@session.default_storage_engine
MyISAM
InnoDB

1
mysql-test/suite/sys_vars/t/default_storage_engine_basic.test
View file

@ -15,6 +15,7 @@
# #
########################################################################
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/load_sysvars.inc

2
mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test
View file

@ -2,7 +2,7 @@
# 2010-01-25 - Added
#
--source include/not_embedded.inc
--source include/have_innodb.inc
SET @start_global_value = @@global.innodb_file_format_max;

1
mysql-test/suite/sys_vars/t/storage_engine_basic.test
View file

@ -21,6 +21,7 @@
# #
########################################################################
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/load_sysvars.inc

1
mysql-test/t/bootstrap-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM --skip-innodb

4
mysql-test/t/bootstrap.test
View file

@ -8,8 +8,7 @@ drop table if exists t1;
# Add the datadir to the bootstrap command
let $MYSQLD_DATADIR= `select @@datadir`;
let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR;
let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --skip-innodb;
#
# Check that --bootstrap reads from stdin
#
@ -20,7 +19,6 @@ EOF
--exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
drop table t1;
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
#
# Check that --bootstrap of file with SQL error returns error
#

2
mysql-test/t/bug46760.test
View file

@ -29,7 +29,7 @@ DROP TABLE t1;
--echo # ROW_FORMAT=COMPRESSED
--echo #
CREATE TABLE t1 (a INT) ROW_FORMAT=compressed;
CREATE TABLE t1 (a INT) ROW_FORMAT=compressed, ENGINE=MyISAM;
SHOW CREATE TABLE t1;
OPTIMIZE TABLE t1;
SHOW CREATE TABLE t1;

1
mysql-test/t/ctype_utf8-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM

1
mysql-test/t/ctype_utf8mb4-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM

1
mysql-test/t/ctype_utf8mb4_innodb-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM

1
mysql-test/t/implicit_commit-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM

1
mysql-test/t/mdl_sync-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM

1
mysql-test/t/mysqldump-max-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM

1
mysql-test/t/partition_innodb.test
View file

@ -1,3 +1,4 @@
--source include/not_embedded.inc
--source include/have_partition.inc
--source include/have_innodb.inc

2
mysql-test/t/partition_innodb_semi_consistent-master.opt
View file

@ -1 +1 @@
--innodb_lock_wait_timeout=2
--innodb_lock_wait_timeout=2 --default-storage-engine=MyISAM

1
mysql-test/t/ps_3innodb-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM

1
mysql-test/t/strict-master.opt Normal file
View file

@ -0,0 +1 @@
--default-storage-engine=MyISAM

8
sql/mysqld.cc
View file

@ -3435,8 +3435,16 @@ static int init_common_variables()
compiler error in the Sun Studio 12 compiler. As a work-around we
set the def_value member to 0 in my_long_options and initialize it
to the correct value here.
From MySQL 5.5 onwards, the default storage engine is InnoDB
(except in the embedded server, where the default continues to
be MyISAM)
*/
#ifdef EMBEDDED_LIBRARY
default_storage_engine= const_cast<char *>("MyISAM");
#else
default_storage_engine= const_cast<char *>("InnoDB");
#endif
/*
Add server status variables to the dynamic list of

1
storage/innobase/CMakeLists.txt
View file

@ -272,6 +272,7 @@ ELSEIF (MYSQL_VERSION_ID LESS "50137")
ELSE()
# New plugin support, cross-platform , base name for shared module is "ha_innodb"
MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE
DEFAULT
MODULE_OUTPUT_NAME ha_innodb
LINK_LIBRARIES ${ZLIB_LIBRARY})
ENDIF()

6
storage/innobase/handler/ha_innodb.cc
View file

@ -429,7 +429,7 @@ static MYSQL_THDVAR_BOOL(table_locks, PLUGIN_VAR_OPCMDARG,
static MYSQL_THDVAR_BOOL(strict_mode, PLUGIN_VAR_OPCMDARG,
"Use strict mode when evaluating create options.",
NULL, NULL, FALSE);
NULL, NULL, TRUE);
static MYSQL_THDVAR_ULONG(lock_wait_timeout, PLUGIN_VAR_RQCMDARG,
"Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
@ -10809,13 +10809,13 @@ static MYSQL_SYSVAR_ULONG(fast_shutdown, innobase_fast_shutdown,
static MYSQL_SYSVAR_BOOL(file_per_table, srv_file_per_table,
PLUGIN_VAR_NOCMDARG,
"Stores each InnoDB table to an .ibd file in the database dir.",
NULL, NULL, FALSE);
NULL, NULL, TRUE);
static MYSQL_SYSVAR_STR(file_format, innobase_file_format_name,
PLUGIN_VAR_RQCMDARG,
"File format to use for new tables in .ibd files.",
innodb_file_format_name_validate,
innodb_file_format_name_update, "Antelope");
innodb_file_format_name_update, "Barracuda");
/* "innobase_file_format_check" decides whether we would continue
booting the server if the file format stamped on the system