Skip to content

M
mariadb
Commit f9ef13d5 authored by Michael Widenius's avatar Michael Widenius
Browse files
Options

Automatic merge

parents 82d79389 4d48802f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1164 additions and 1126 deletions
client/mysqltest.c
View file @ f9ef13d5
...@@ -2300,7 +2300,7 @@ void do_source(struct st_command *command) ...@@ -2300,7 +2300,7 @@ void do_source(struct st_command *command)
} }
dynstr_free(&ds_filename); dynstr_free(&ds_filename);
return; DBUG_VOID_RETURN;
} }
......
mysql-test/mysql-test-run.pl
View file @ f9ef13d5
...@@ -2186,13 +2186,13 @@ sub environment_setup () { ...@@ -2186,13 +2186,13 @@ sub environment_setup () {
# ---------------------------------------------------- # ----------------------------------------------------
# Setup env so childs can execute maria_pack and maria_chk # Setup env so childs can execute maria_pack and maria_chk
# ---------------------------------------------------- # ----------------------------------------------------
$ENV{'MARIA_CHK'}= mtr_native_path(mtr_exe_exists( $ENV{'MARIA_CHK'}= mtr_native_path(mtr_exe_maybe_exists(
vs_config_dirs('storage/maria', 'maria_chk'), vs_config_dirs('storage/maria', 'maria_chk'),
vs_config_dirs('maria', 'maria_chk'), vs_config_dirs('maria', 'maria_chk'),
"$path_client_bindir/maria_chk", "$path_client_bindir/maria_chk",
"$glob_basedir/storage/maria/maria_chk", "$glob_basedir/storage/maria/maria_chk",
"$glob_basedir/maria/maria_chk")); "$glob_basedir/maria/maria_chk"));
$ENV{'MARIA_PACK'}= mtr_native_path(mtr_exe_exists( $ENV{'MARIA_PACK'}= mtr_native_path(mtr_exe_maybe_exists(
vs_config_dirs('storage/maria', 'maria_pack'), vs_config_dirs('storage/maria', 'maria_pack'),
vs_config_dirs('maria', 'maria_pack'), vs_config_dirs('maria', 'maria_pack'),
"$path_client_bindir/maria_pack", "$path_client_bindir/maria_pack",
......
mysql-test/r/maria-preload.result
View file @ f9ef13d5
drop table if exists t1, t2; drop table if exists t1, t2;
set global maria_checkpoint_interval=0;
create temporary table initial create temporary table initial
select variable_name,variable_value from select variable_name,variable_value from
information_schema.global_status where variable_name like "Maria_pagecache_read%"; information_schema.global_status where variable_name like "Maria_pagecache_reads";
create table t1 ( create table t1 (
a int not null auto_increment, a int not null auto_increment,
b char(16) not null, b char(16) not null,
...@@ -51,21 +52,18 @@ flush tables; ...@@ -51,21 +52,18 @@ flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 211644
MARIA_PAGECACHE_READS 3 MARIA_PAGECACHE_READS 3
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
4181 4181
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 211926
MARIA_PAGECACHE_READS 11 MARIA_PAGECACHE_READS 11
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
4181 4181
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 212208
MARIA_PAGECACHE_READS 12 MARIA_PAGECACHE_READS 12
flush tables; flush tables;
flush status; flush status;
...@@ -77,20 +75,17 @@ Table Op Msg_type Msg_text ...@@ -77,20 +75,17 @@ Table Op Msg_type Msg_text
test.t1 preload_keys status OK test.t1 preload_keys status OK
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 212535
MARIA_PAGECACHE_READS 84 MARIA_PAGECACHE_READS 84
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
4181 4181
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 212817
MARIA_PAGECACHE_READS 85 MARIA_PAGECACHE_READS 85
flush tables; flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 213073
MARIA_PAGECACHE_READS 86 MARIA_PAGECACHE_READS 86
set session preload_buffer_size=256*1024; set session preload_buffer_size=256*1024;
select @@preload_buffer_size; select @@preload_buffer_size;
...@@ -101,20 +96,17 @@ Table Op Msg_type Msg_text ...@@ -101,20 +96,17 @@ Table Op Msg_type Msg_text
test.t1 preload_keys status OK test.t1 preload_keys status OK
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 213400
MARIA_PAGECACHE_READS 158 MARIA_PAGECACHE_READS 158
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
4181 4181
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 213682
MARIA_PAGECACHE_READS 165 MARIA_PAGECACHE_READS 165
flush tables; flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 213938
MARIA_PAGECACHE_READS 166 MARIA_PAGECACHE_READS 166
set session preload_buffer_size=1*1024; set session preload_buffer_size=1*1024;
select @@preload_buffer_size; select @@preload_buffer_size;
...@@ -126,7 +118,6 @@ test.t1 preload_keys status OK ...@@ -126,7 +118,6 @@ test.t1 preload_keys status OK
test.t2 preload_keys status OK test.t2 preload_keys status OK
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 214308
MARIA_PAGECACHE_READS 281 MARIA_PAGECACHE_READS 281
select count(*) from t1 where b = 'test1'; select count(*) from t1 where b = 'test1';
count(*) count(*)
...@@ -136,13 +127,11 @@ count(*) ...@@ -136,13 +127,11 @@ count(*)
2584 2584
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 214604
MARIA_PAGECACHE_READS 285 MARIA_PAGECACHE_READS 285
flush tables; flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 214860
MARIA_PAGECACHE_READS 286 MARIA_PAGECACHE_READS 286
load index into cache t3, t2 key (primary,b) ; load index into cache t3, t2 key (primary,b) ;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
...@@ -151,13 +140,11 @@ test.t3 preload_keys error Corrupt ...@@ -151,13 +140,11 @@ test.t3 preload_keys error Corrupt
test.t2 preload_keys status OK test.t2 preload_keys status OK
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 215159
MARIA_PAGECACHE_READS 330 MARIA_PAGECACHE_READS 330
flush tables; flush tables;
flush status; flush status;
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 215415
MARIA_PAGECACHE_READS 331 MARIA_PAGECACHE_READS 331
load index into cache t3 key (b), t2 key (c) ; load index into cache t3 key (b), t2 key (c) ;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
...@@ -167,7 +154,6 @@ test.t2 preload_keys Error Key 'c' doesn't exist in table 't2' ...@@ -167,7 +154,6 @@ test.t2 preload_keys Error Key 'c' doesn't exist in table 't2'
test.t2 preload_keys status Operation failed test.t2 preload_keys status Operation failed
select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc;
variable_name g.variable_value-i.variable_value variable_name g.variable_value-i.variable_value
MARIA_PAGECACHE_READ_REQUESTS 215671
MARIA_PAGECACHE_READS 332 MARIA_PAGECACHE_READS 332
drop table t1, t2; drop table t1, t2;
drop temporary table initial; drop temporary table initial;
......
mysql-test/r/maria-recover.result
View file @ f9ef13d5
...@@ -24,8 +24,8 @@ select * from t_corrupted2; ...@@ -24,8 +24,8 @@ select * from t_corrupted2;
a a
ThursdayMorningsMarket ThursdayMorningsMarket
Warnings: Warnings:
Error 145 Table '.t_corrupted2' is marked as crashed and should be repaired Error 145 t_corrupted2' is marked as crashed and should be repaired
Error 1194 Table 't_corrupted2' is marked as crashed and should be repaired Error 1194 t_corrupted2' is marked as crashed and should be repaired
Error 1034 1 client is using or hasn't closed the table properly Error 1034 1 client is using or hasn't closed the table properly
Error 1034 Wrong base information on indexpage at page: 1 Error 1034 Wrong base information on indexpage at page: 1
select * from t_corrupted2; select * from t_corrupted2;
......
mysql-test/r/maria.result
View file @ f9ef13d5
This diff is collapsed.
mysql-test/r/maria3.result 0 → 100644
View file @ f9ef13d5
This diff is collapsed.
mysql-test/suite/funcs_1/datadict/processlist_priv.inc
View file @ f9ef13d5
...@@ -111,6 +111,7 @@ connect (con100,localhost,ddicttestuser1,ddictpass,information_schema); ...@@ -111,6 +111,7 @@ connect (con100,localhost,ddicttestuser1,ddictpass,information_schema);
--echo SHOW/SELECT shows all processes/threads. --echo SHOW/SELECT shows all processes/threads.
--echo #################################################################################### --echo ####################################################################################
connection default; connection default;
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE $table; eval SHOW CREATE TABLE $table;
--replace_column 1 ID 6 TIME --replace_column 1 ID 6 TIME
eval SHOW $table; eval SHOW $table;
...@@ -127,6 +128,7 @@ eval SELECT $columns FROM $table $select_where ORDER BY id; ...@@ -127,6 +128,7 @@ eval SELECT $columns FROM $table $select_where ORDER BY id;
connection con100; connection con100;
--echo SHOW/SELECT shows only the processes (1) of the user. --echo SHOW/SELECT shows only the processes (1) of the user.
--echo #################################################################################### --echo ####################################################################################
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE $table; eval SHOW CREATE TABLE $table;
--replace_column 1 ID 6 TIME --replace_column 1 ID 6 TIME
eval SHOW $table; eval SHOW $table;
......
mysql-test/suite/funcs_1/datadict/processlist_val.inc
View file @ f9ef13d5
...@@ -53,6 +53,7 @@ CREATE TABLE test.t1 (f1 BIGINT); ...@@ -53,6 +53,7 @@ CREATE TABLE test.t1 (f1 BIGINT);
# Show the definition of the PROCESSLIST table # Show the definition of the PROCESSLIST table
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST; SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST;
......
mysql-test/suite/funcs_1/datadict/tables2.inc
View file @ f9ef13d5
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
let $innodb_pattern = 'InnoDB free'; let $innodb_pattern = 'InnoDB free';
let $ndb_pattern = 'number_of_replicas'; let $ndb_pattern = 'number_of_replicas';
--vertical_results --vertical_results
--replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA MARIA MYISAM_OR_MARIA
--replace_column 8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#" --replace_column 8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#"
eval eval
SELECT *, SELECT *,
......
mysql-test/suite/funcs_1/r/is_columns.result
View file @ f9ef13d5
...@@ -69,7 +69,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS` ( ...@@ -69,7 +69,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS` (
`EXTRA` varchar(27) NOT NULL DEFAULT '', `EXTRA` varchar(27) NOT NULL DEFAULT '',
`PRIVILEGES` varchar(80) NOT NULL DEFAULT '', `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
`COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT '' `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.COLUMNS; SHOW COLUMNS FROM information_schema.COLUMNS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) YES NULL TABLE_CATALOG varchar(512) YES NULL
......
mysql-test/suite/funcs_1/r/is_events.result
View file @ f9ef13d5
...@@ -79,7 +79,7 @@ EVENTS CREATE TEMPORARY TABLE `EVENTS` ( ...@@ -79,7 +79,7 @@ EVENTS CREATE TEMPORARY TABLE `EVENTS` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.EVENTS; SHOW COLUMNS FROM information_schema.EVENTS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
EVENT_CATALOG varchar(64) YES NULL EVENT_CATALOG varchar(64) YES NULL
......
mysql-test/suite/funcs_1/r/is_routines.result
View file @ f9ef13d5
...@@ -77,7 +77,7 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( ...@@ -77,7 +77,7 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINES` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.ROUTINES; SHOW COLUMNS FROM information_schema.ROUTINES;
Field Type Null Key Default Extra Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO SPECIFIC_NAME varchar(64) NO
......
mysql-test/suite/funcs_1/r/is_tables_is.result
View file @ f9ef13d5
...@@ -86,9 +86,9 @@ TABLE_CATALOG NULL ...@@ -86,9 +86,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME COLUMNS TABLE_NAME COLUMNS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -155,9 +155,9 @@ TABLE_CATALOG NULL ...@@ -155,9 +155,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME EVENTS TABLE_NAME EVENTS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -270,9 +270,9 @@ TABLE_CATALOG NULL ...@@ -270,9 +270,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME PARTITIONS TABLE_NAME PARTITIONS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -293,9 +293,9 @@ TABLE_CATALOG NULL ...@@ -293,9 +293,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME PLUGINS TABLE_NAME PLUGINS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -316,9 +316,9 @@ TABLE_CATALOG NULL ...@@ -316,9 +316,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME PROCESSLIST TABLE_NAME PROCESSLIST
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -362,9 +362,9 @@ TABLE_CATALOG NULL ...@@ -362,9 +362,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -569,9 +569,9 @@ TABLE_CATALOG NULL ...@@ -569,9 +569,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME TRIGGERS TABLE_NAME TRIGGERS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -615,9 +615,9 @@ TABLE_CATALOG NULL ...@@ -615,9 +615,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME VIEWS TABLE_NAME VIEWS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -724,9 +724,9 @@ TABLE_CATALOG NULL ...@@ -724,9 +724,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME COLUMNS TABLE_NAME COLUMNS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -793,9 +793,9 @@ TABLE_CATALOG NULL ...@@ -793,9 +793,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME EVENTS TABLE_NAME EVENTS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -908,9 +908,9 @@ TABLE_CATALOG NULL ...@@ -908,9 +908,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME PARTITIONS TABLE_NAME PARTITIONS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -931,9 +931,9 @@ TABLE_CATALOG NULL ...@@ -931,9 +931,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME PLUGINS TABLE_NAME PLUGINS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -954,9 +954,9 @@ TABLE_CATALOG NULL ...@@ -954,9 +954,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME PROCESSLIST TABLE_NAME PROCESSLIST
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -1000,9 +1000,9 @@ TABLE_CATALOG NULL ...@@ -1000,9 +1000,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME ROUTINES TABLE_NAME ROUTINES
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -1207,9 +1207,9 @@ TABLE_CATALOG NULL ...@@ -1207,9 +1207,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME TRIGGERS TABLE_NAME TRIGGERS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -1253,9 +1253,9 @@ TABLE_CATALOG NULL ...@@ -1253,9 +1253,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA information_schema TABLE_SCHEMA information_schema
TABLE_NAME VIEWS TABLE_NAME VIEWS
TABLE_TYPE SYSTEM VIEW TABLE_TYPE SYSTEM VIEW
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
......
mysql-test/suite/funcs_1/r/is_tables_myisam.result
View file @ f9ef13d5
...@@ -415,7 +415,7 @@ TABLE_CATALOG NULL ...@@ -415,7 +415,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t1 TABLE_NAME t1
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -438,7 +438,7 @@ TABLE_CATALOG NULL ...@@ -438,7 +438,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t10 TABLE_NAME t10
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -461,7 +461,7 @@ TABLE_CATALOG NULL ...@@ -461,7 +461,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t11 TABLE_NAME t11
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -484,7 +484,7 @@ TABLE_CATALOG NULL ...@@ -484,7 +484,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t2 TABLE_NAME t2
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -507,7 +507,7 @@ TABLE_CATALOG NULL ...@@ -507,7 +507,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t3 TABLE_NAME t3
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -530,7 +530,7 @@ TABLE_CATALOG NULL ...@@ -530,7 +530,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t4 TABLE_NAME t4
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -553,7 +553,7 @@ TABLE_CATALOG NULL ...@@ -553,7 +553,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t7 TABLE_NAME t7
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -576,7 +576,7 @@ TABLE_CATALOG NULL ...@@ -576,7 +576,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t8 TABLE_NAME t8
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -599,7 +599,7 @@ TABLE_CATALOG NULL ...@@ -599,7 +599,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t9 TABLE_NAME t9
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -622,9 +622,9 @@ TABLE_CATALOG NULL ...@@ -622,9 +622,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME tb1 TABLE_NAME tb1
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -645,9 +645,9 @@ TABLE_CATALOG NULL ...@@ -645,9 +645,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME tb2 TABLE_NAME tb2
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -668,9 +668,9 @@ TABLE_CATALOG NULL ...@@ -668,9 +668,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME tb3 TABLE_NAME tb3
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -691,9 +691,9 @@ TABLE_CATALOG NULL ...@@ -691,9 +691,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME tb4 TABLE_NAME tb4
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -714,9 +714,9 @@ TABLE_CATALOG NULL ...@@ -714,9 +714,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test1 TABLE_SCHEMA test1
TABLE_NAME tb2 TABLE_NAME tb2
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -737,7 +737,7 @@ TABLE_CATALOG NULL ...@@ -737,7 +737,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test4 TABLE_SCHEMA test4
TABLE_NAME t6 TABLE_NAME t6
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -776,7 +776,7 @@ TABLE_CATALOG NULL ...@@ -776,7 +776,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t1 TABLE_NAME t1
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -799,7 +799,7 @@ TABLE_CATALOG NULL ...@@ -799,7 +799,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t10 TABLE_NAME t10
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -822,7 +822,7 @@ TABLE_CATALOG NULL ...@@ -822,7 +822,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t11 TABLE_NAME t11
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -845,7 +845,7 @@ TABLE_CATALOG NULL ...@@ -845,7 +845,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t2 TABLE_NAME t2
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -868,7 +868,7 @@ TABLE_CATALOG NULL ...@@ -868,7 +868,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t3 TABLE_NAME t3
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -891,7 +891,7 @@ TABLE_CATALOG NULL ...@@ -891,7 +891,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t4 TABLE_NAME t4
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -914,7 +914,7 @@ TABLE_CATALOG NULL ...@@ -914,7 +914,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t7 TABLE_NAME t7
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -937,7 +937,7 @@ TABLE_CATALOG NULL ...@@ -937,7 +937,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t8 TABLE_NAME t8
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -960,7 +960,7 @@ TABLE_CATALOG NULL ...@@ -960,7 +960,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME t9 TABLE_NAME t9
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -983,9 +983,9 @@ TABLE_CATALOG NULL ...@@ -983,9 +983,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME tb1 TABLE_NAME tb1
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -1006,9 +1006,9 @@ TABLE_CATALOG NULL ...@@ -1006,9 +1006,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME tb2 TABLE_NAME tb2
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -1029,9 +1029,9 @@ TABLE_CATALOG NULL ...@@ -1029,9 +1029,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME tb3 TABLE_NAME tb3
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -1052,9 +1052,9 @@ TABLE_CATALOG NULL ...@@ -1052,9 +1052,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA test TABLE_SCHEMA test
TABLE_NAME tb4 TABLE_NAME tb4
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
......
mysql-test/suite/funcs_1/r/is_tables_mysql.result
View file @ f9ef13d5
...@@ -16,7 +16,7 @@ TABLE_CATALOG NULL ...@@ -16,7 +16,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME columns_priv TABLE_NAME columns_priv
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -39,7 +39,7 @@ TABLE_CATALOG NULL ...@@ -39,7 +39,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME db TABLE_NAME db
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -62,9 +62,9 @@ TABLE_CATALOG NULL ...@@ -62,9 +62,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME event TABLE_NAME event
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -85,7 +85,7 @@ TABLE_CATALOG NULL ...@@ -85,7 +85,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME func TABLE_NAME func
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -110,7 +110,7 @@ TABLE_NAME general_log ...@@ -110,7 +110,7 @@ TABLE_NAME general_log
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE CSV ENGINE CSV
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -131,7 +131,7 @@ TABLE_CATALOG NULL ...@@ -131,7 +131,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME help_category TABLE_NAME help_category
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -154,7 +154,7 @@ TABLE_CATALOG NULL ...@@ -154,7 +154,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME help_keyword TABLE_NAME help_keyword
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -177,7 +177,7 @@ TABLE_CATALOG NULL ...@@ -177,7 +177,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME help_relation TABLE_NAME help_relation
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -200,9 +200,9 @@ TABLE_CATALOG NULL ...@@ -200,9 +200,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME help_topic TABLE_NAME help_topic
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -223,7 +223,7 @@ TABLE_CATALOG NULL ...@@ -223,7 +223,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME host TABLE_NAME host
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -246,9 +246,9 @@ TABLE_CATALOG NULL ...@@ -246,9 +246,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME ndb_binlog_index TABLE_NAME ndb_binlog_index
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -269,7 +269,7 @@ TABLE_CATALOG NULL ...@@ -269,7 +269,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME plugin TABLE_NAME plugin
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -292,9 +292,9 @@ TABLE_CATALOG NULL ...@@ -292,9 +292,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME proc TABLE_NAME proc
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -315,7 +315,7 @@ TABLE_CATALOG NULL ...@@ -315,7 +315,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME procs_priv TABLE_NAME procs_priv
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -338,7 +338,7 @@ TABLE_CATALOG NULL ...@@ -338,7 +338,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME servers TABLE_NAME servers
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -363,7 +363,7 @@ TABLE_NAME slow_log ...@@ -363,7 +363,7 @@ TABLE_NAME slow_log
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE CSV ENGINE CSV
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
...@@ -384,7 +384,7 @@ TABLE_CATALOG NULL ...@@ -384,7 +384,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME tables_priv TABLE_NAME tables_priv
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -407,7 +407,7 @@ TABLE_CATALOG NULL ...@@ -407,7 +407,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME time_zone TABLE_NAME time_zone
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -430,7 +430,7 @@ TABLE_CATALOG NULL ...@@ -430,7 +430,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME time_zone_leap_second TABLE_NAME time_zone_leap_second
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -453,7 +453,7 @@ TABLE_CATALOG NULL ...@@ -453,7 +453,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME time_zone_name TABLE_NAME time_zone_name
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -476,7 +476,7 @@ TABLE_CATALOG NULL ...@@ -476,7 +476,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME time_zone_transition TABLE_NAME time_zone_transition
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -499,7 +499,7 @@ TABLE_CATALOG NULL ...@@ -499,7 +499,7 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME time_zone_transition_type TABLE_NAME time_zone_transition_type
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
...@@ -522,9 +522,9 @@ TABLE_CATALOG NULL ...@@ -522,9 +522,9 @@ TABLE_CATALOG NULL
TABLE_SCHEMA mysql TABLE_SCHEMA mysql
TABLE_NAME user TABLE_NAME user
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
......
mysql-test/suite/funcs_1/r/is_triggers.result
View file @ f9ef13d5
...@@ -75,7 +75,7 @@ TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( ...@@ -75,7 +75,7 @@ TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` (
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '', `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
`DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT '' `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TRIGGERS; SHOW COLUMNS FROM information_schema.TRIGGERS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TRIGGER_CATALOG varchar(512) YES NULL TRIGGER_CATALOG varchar(512) YES NULL
......
mysql-test/suite/funcs_1/r/is_views.result
View file @ f9ef13d5
...@@ -51,7 +51,7 @@ VIEWS CREATE TEMPORARY TABLE `VIEWS` ( ...@@ -51,7 +51,7 @@ VIEWS CREATE TEMPORARY TABLE `VIEWS` (
`SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '', `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
`CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '', `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
`COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '' `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT ''
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.VIEWS; SHOW COLUMNS FROM information_schema.VIEWS;
Field Type Null Key Default Extra Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) YES NULL TABLE_CATALOG varchar(512) YES NULL
......
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
View file @ f9ef13d5
...@@ -32,7 +32,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ...@@ -32,7 +32,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`TIME` bigint(7) NOT NULL DEFAULT '0', `TIME` bigint(7) NOT NULL DEFAULT '0',
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64) DEFAULT NULL,
`INFO` longtext `INFO` longtext
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW processlist; SHOW processlist;
Id User Host db Command Time State Info Id User Host db Command Time State Info
ID root localhost information_schema Query TIME NULL SHOW processlist ID root localhost information_schema Query TIME NULL SHOW processlist
...@@ -102,7 +102,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ...@@ -102,7 +102,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`TIME` bigint(7) NOT NULL DEFAULT '0', `TIME` bigint(7) NOT NULL DEFAULT '0',
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64) DEFAULT NULL,
`INFO` longtext `INFO` longtext
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW processlist; SHOW processlist;
Id User Host db Command Time State Info Id User Host db Command Time State Info
ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
......
mysql-test/suite/funcs_1/r/processlist_priv_ps.result
View file @ f9ef13d5
...@@ -32,7 +32,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ...@@ -32,7 +32,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`TIME` bigint(7) NOT NULL DEFAULT '0', `TIME` bigint(7) NOT NULL DEFAULT '0',
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64) DEFAULT NULL,
`INFO` longtext `INFO` longtext
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW processlist; SHOW processlist;
Id User Host db Command Time State Info Id User Host db Command Time State Info
ID root localhost information_schema Query TIME NULL SHOW processlist ID root localhost information_schema Query TIME NULL SHOW processlist
...@@ -102,7 +102,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ...@@ -102,7 +102,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`TIME` bigint(7) NOT NULL DEFAULT '0', `TIME` bigint(7) NOT NULL DEFAULT '0',
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64) DEFAULT NULL,
`INFO` longtext `INFO` longtext
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SHOW processlist; SHOW processlist;
Id User Host db Command Time State Info Id User Host db Command Time State Info
ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
......
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
View file @ f9ef13d5
...@@ -17,7 +17,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ...@@ -17,7 +17,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`TIME` bigint(7) NOT NULL DEFAULT '0', `TIME` bigint(7) NOT NULL DEFAULT '0',
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64) DEFAULT NULL,
`INFO` longtext `INFO` longtext
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST; SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST;
COUNT(*) COUNT(*)
1 1
......
mysql-test/suite/funcs_1/r/processlist_val_ps.result
View file @ f9ef13d5
...@@ -17,7 +17,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ...@@ -17,7 +17,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` (
`TIME` bigint(7) NOT NULL DEFAULT '0', `TIME` bigint(7) NOT NULL DEFAULT '0',
`STATE` varchar(64) DEFAULT NULL, `STATE` varchar(64) DEFAULT NULL,
`INFO` longtext `INFO` longtext
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ) DEFAULT CHARSET=utf8
SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST; SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST;
COUNT(*) COUNT(*)
1 1
......
mysql-test/suite/funcs_1/t/is_columns.test
View file @ f9ef13d5
...@@ -76,6 +76,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table'; ...@@ -76,6 +76,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval DESCRIBE information_schema.$is_table; eval DESCRIBE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table; eval SHOW CREATE TABLE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval SHOW COLUMNS FROM information_schema.$is_table; eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/funcs_1/t/is_events.test
View file @ f9ef13d5
...@@ -86,6 +86,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table'; ...@@ -86,6 +86,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
# is associated. # is associated.
# #
eval DESCRIBE information_schema.$is_table; eval DESCRIBE information_schema.$is_table;
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table; eval SHOW CREATE TABLE information_schema.$is_table;
eval SHOW COLUMNS FROM information_schema.$is_table; eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/funcs_1/t/is_routines.test
View file @ f9ef13d5
...@@ -74,6 +74,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table'; ...@@ -74,6 +74,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval DESCRIBE information_schema.$is_table; eval DESCRIBE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table; eval SHOW CREATE TABLE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval SHOW COLUMNS FROM information_schema.$is_table; eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/funcs_1/t/is_triggers.test
View file @ f9ef13d5
...@@ -69,6 +69,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table'; ...@@ -69,6 +69,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval DESCRIBE information_schema.$is_table; eval DESCRIBE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table; eval SHOW CREATE TABLE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval SHOW COLUMNS FROM information_schema.$is_table; eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/suite/funcs_1/t/is_views.test
View file @ f9ef13d5
...@@ -59,6 +59,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table'; ...@@ -59,6 +59,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval DESCRIBE information_schema.$is_table; eval DESCRIBE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE information_schema.$is_table; eval SHOW CREATE TABLE information_schema.$is_table;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval SHOW COLUMNS FROM information_schema.$is_table; eval SHOW COLUMNS FROM information_schema.$is_table;
......
mysql-test/t/disabled.def
View file @ f9ef13d5
...@@ -19,4 +19,3 @@ ctype_create : Bug#32965 main.ctype_create fails ...@@ -19,4 +19,3 @@ ctype_create : Bug#32965 main.ctype_create fails
status : Bug#32966 main.status fails status : Bug#32966 main.status fails
ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166 ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
maria-preload : Bug#35107 crashes
mysql-test/t/maria-no-logging.test
View file @ f9ef13d5
# test of cases where we can safely disable logging # test of cases where we can safely disable logging
--source include/have_maria.inc --source include/have_maria.inc
# can't restart server in embedded
--source include/not_embedded.inc
set global maria_log_file_size=4294967295; set global maria_log_file_size=4294967295;
...@@ -9,7 +11,7 @@ drop database if exists mysqltest; ...@@ -9,7 +11,7 @@ drop database if exists mysqltest;
--enable_warnings --enable_warnings
create database mysqltest; create database mysqltest;
connect (admin, 127.0.0.1, root,,mysqltest,,); connect (admin, localhost, root,,mysqltest,,);
--enable_reconnect --enable_reconnect
connection default; connection default;
......
mysql-test/t/maria-preload.test
View file @ f9ef13d5
...@@ -8,11 +8,16 @@ ...@@ -8,11 +8,16 @@
drop table if exists t1, t2; drop table if exists t1, t2;
--enable_warnings --enable_warnings
# Background dirty pages flushing may influence page cache stats:
let $def_checkinterval=`select @@global.maria_checkpoint_interval`;
set global maria_checkpoint_interval=0;
# Work around BUG#34911 "FLUSH STATUS doesn't flush what it should": # Work around BUG#34911 "FLUSH STATUS doesn't flush what it should":
# compute differences in status variables before and after relevant queries # compute differences in status variables before and after relevant
# queries. Maria_pagecache_read_requests varies accross machines.
create temporary table initial create temporary table initial
select variable_name,variable_value from select variable_name,variable_value from
information_schema.global_status where variable_name like "Maria_pagecache_read%"; information_schema.global_status where variable_name like "Maria_pagecache_reads";
# we don't use block-format because we want page cache stats # we don't use block-format because we want page cache stats
# about indices and not data pages. # about indices and not data pages.
...@@ -111,3 +116,9 @@ drop temporary table initial; ...@@ -111,3 +116,9 @@ drop temporary table initial;
# check that Maria didn't use key cache # check that Maria didn't use key cache
show status like "key_read%"; show status like "key_read%";
--disable_result_log
--disable_query_log
eval set global maria_checkpoint_interval=$def_checkinterval;
--enable_result_log
--enable_query_log
mysql-test/t/maria-purge.test
View file @ f9ef13d5
-- source include/have_maria.inc -- source include/have_maria.inc
-- source include/big_test.inc -- source include/big_test.inc
-- source include/not_embedded.inc
# pre-requisites for maria_empty_logs # pre-requisites for maria_empty_logs
connect (admin, 127.0.0.1, root,,test,,); connect (admin, localhost, root,,test,,);
# #
--enable_reconnect --enable_reconnect
connection default; connection default;
......
mysql-test/t/maria-recover-master.opt
View file @ f9ef13d5
--maria-recover=backup --maria-log-dir-path=../tmp --loose-maria-recover=backup --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp
mysql-test/t/maria-recover.test
View file @ f9ef13d5
...@@ -48,7 +48,7 @@ EOF ...@@ -48,7 +48,7 @@ EOF
# line below will be removed # line below will be removed
disable_ps_protocol; disable_ps_protocol;
replace_regex /.mysqltest.t_corrupted2/t_corrupted2/ ; replace_regex /Table.*t_corrupted2/t_corrupted2/ ;
select * from t_corrupted2; # should show corruption and repair messages select * from t_corrupted2; # should show corruption and repair messages
enable_ps_protocol; enable_ps_protocol;
select * from t_corrupted2; # should show just rows select * from t_corrupted2; # should show just rows
......
mysql-test/t/maria-recovery-big.test
View file @ f9ef13d5
...@@ -20,7 +20,7 @@ let $mms_tname=t; ...@@ -20,7 +20,7 @@ let $mms_tname=t;
# Include scripts can perform SQL. For it to not influence the main test # Include scripts can perform SQL. For it to not influence the main test
# they use a separate connection. This way if they use a DDL it would # they use a separate connection. This way if they use a DDL it would
# not autocommit in the main test. # not autocommit in the main test.
connect (admin, 127.0.0.1, root,,mysqltest,,); connect (admin, localhost, root,,mysqltest,,);
--enable_reconnect --enable_reconnect
connection default; connection default;
......
mysql-test/t/maria-recovery-bitmap.test
View file @ f9ef13d5
...@@ -16,7 +16,7 @@ let $mms_tname=t; ...@@ -16,7 +16,7 @@ let $mms_tname=t;
# Include scripts can perform SQL. For it to not influence the main test # Include scripts can perform SQL. For it to not influence the main test
# they use a separate connection. This way if they use a DDL it would # they use a separate connection. This way if they use a DDL it would
# not autocommit in the main test. # not autocommit in the main test.
connect (admin, 127.0.0.1, root,,mysqltest,,); connect (admin, localhost, root,,mysqltest,,);
--enable_reconnect --enable_reconnect
connection default; connection default;
......
mysql-test/t/maria-recovery-master.opt
View file @ f9ef13d5
--skip-stack-trace --skip-core-file --maria-log-dir-path=../tmp --skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp
mysql-test/t/maria-recovery-rtree-ft.test
View file @ f9ef13d5
...@@ -19,7 +19,7 @@ let $mms_tname=t; ...@@ -19,7 +19,7 @@ let $mms_tname=t;
# Include scripts can perform SQL. For it to not influence the main test # Include scripts can perform SQL. For it to not influence the main test
# they use a separate connection. This way if they use a DDL it would # they use a separate connection. This way if they use a DDL it would
# not autocommit in the main test. # not autocommit in the main test.
connect (admin, 127.0.0.1, root,,mysqltest,,); connect (admin, localhost, root,,mysqltest,,);
--enable_reconnect --enable_reconnect
connection default; connection default;
......
mysql-test/t/maria-recovery.test
View file @ f9ef13d5
...@@ -17,7 +17,7 @@ let $mms_tname=t; ...@@ -17,7 +17,7 @@ let $mms_tname=t;
# Include scripts can perform SQL. For it to not influence the main test # Include scripts can perform SQL. For it to not influence the main test
# they use a separate connection. This way if they use a DDL it would # they use a separate connection. This way if they use a DDL it would
# not autocommit in the main test. # not autocommit in the main test.
connect (admin, 127.0.0.1, root,,mysqltest,,); connect (admin, localhost, root,,mysqltest,,);
--enable_reconnect --enable_reconnect
connection default; connection default;
......
mysql-test/t/maria.test
View file @ f9ef13d5
This diff is collapsed.
mysql-test/t/maria3.test 0 → 100644
View file @ f9ef13d5
This diff is collapsed.
storage/maria/ma_delete.c
View file @ f9ef13d5
...@@ -1523,8 +1523,8 @@ int _ma_write_undo_key_delete(MARIA_HA *info, const MARIA_KEY *key, ...@@ -1523,8 +1523,8 @@ int _ma_write_undo_key_delete(MARIA_HA *info, const MARIA_KEY *key,
return translog_write_record(res_lsn, log_type, return translog_write_record(res_lsn, log_type,
info->trn, info, info->trn, info,
(translog_size_t) (translog_size_t)
log_array[TRANSLOG_INTERNAL_PARTS + 0].length + (log_array[TRANSLOG_INTERNAL_PARTS + 0].length +
log_array[TRANSLOG_INTERNAL_PARTS + 1].length, log_array[TRANSLOG_INTERNAL_PARTS + 1].length),
TRANSLOG_INTERNAL_PARTS + 2, log_array, TRANSLOG_INTERNAL_PARTS + 2, log_array,
log_data + LSN_STORE_SIZE, &msg) ? -1 : 0; log_data + LSN_STORE_SIZE, &msg) ? -1 : 0;
} }
storage/maria/ma_test_force_start.pl
View file @ f9ef13d5
...@@ -160,7 +160,7 @@ open(FILE, "<", $error_log_name) or die; ...@@ -160,7 +160,7 @@ open(FILE, "<", $error_log_name) or die;
@cmd_output= <FILE>; @cmd_output= <FILE>;
close FILE; close FILE;
die unless grep(/\[Warning\] mysqld(.exe)*: Maria engine: removed all logs after [\d]+ consecutive failures of recovery from logs/, @cmd_output); die unless grep(/\[Warning\] mysqld(.exe)*: Maria engine: removed all logs after [\d]+ consecutive failures of recovery from logs/, @cmd_output);
die unless grep(/\[ERROR\] mysqld(.exe)*: File '...tmp.maria_log.00000001' not found \(Errcode: 2\)/, @cmd_output); die unless grep(/\[ERROR\] mysqld(.exe)*: File '.*tmp.maria_log.00000001' not found \(Errcode: 2\)/, @cmd_output);
print "success - ok\n"; print "success - ok\n";
open(FILE, ">", $sql_name) or die; open(FILE, ">", $sql_name) or die;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7