1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Yuchen Pei 2023-09-25 13:06:57 +10:00
commit 6b343de8ef
No known key found for this signature in database
GPG Key ID: 3DD1B35105743563
27 changed files with 431 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
mysql-test/main/having.result
View File

@ -904,5 +904,54 @@ SELECT * FROM t HAVING f = 'foo';
f f
DROP TABLE t; DROP TABLE t;
# #
# MDEV-29731 Crash when HAVING in a correlated subquery references
# columns in the outer query
#
CREATE TABLE t (a INT, b INT);
SELECT 1 FROM t
WHERE b = (SELECT 1 FROM t GROUP BY a HAVING b = a+1);
1
DROP TABLE t;
CREATE TABLE t (a INT, b INT, c INT);
SELECT 1 FROM t
WHERE (b,c) = (SELECT 1,1 FROM t GROUP BY a HAVING b = a+1 and c = a-1);
1
DROP TABLE t;
CREATE TABLE t (a TEXT, b INT UNIQUE);
SELECT 1 FROM t
WHERE b IN (SELECT 1 FROM t
GROUP BY '', a
HAVING (CASE b WHEN 1 +'' THEN 3 ELSE a END)
ORDER BY b)
GROUP BY b HAVING b = 1;
1
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: ''
DROP TABLE t;
CREATE TABLE t (a INT, b CHAR KEY UNIQUE);
CREATE VIEW v AS SELECT * FROM t WHERE a LIKE '' GROUP BY b HAVING a > a;
SELECT * FROM v AS v1 NATURAL JOIN v AS v5 NATURAL JOIN v
WHERE a LIKE '' AND b IN (SELECT a FROM t
WHERE a LIKE ''
GROUP BY a
HAVING b LIKE (b < +1 OR a > 1) >= b);
a b
DROP VIEW v;
DROP TABLE t;
EXECUTE IMMEDIATE 'SELECT LEAD(c) OVER (ORDER BY c)
FROM (SELECT 0 AS c) AS a NATURAL JOIN (SELECT 0 AS c) AS b;';
LEAD(c) OVER (ORDER BY c)
NULL
CREATE TABLE t (a INT);
UPDATE t SET a = ''
WHERE 1 IN (SELECT * FROM
(SELECT * FROM
(SELECT * FROM t AS v5 NATURAL JOIN t AS v4 NATURAL JOIN t) AS v3
NATURAL JOIN t
GROUP BY a) AS v2
WHERE (0, a) IN ((0,-1),(+1,0))
ORDER BY 1+AVG(a) OVER (ORDER BY a)) ORDER BY a;
DROP TABLE t;
#
# End of 10.4 tests # End of 10.4 tests
# #

47
mysql-test/main/having.test
View File

@ -950,8 +950,53 @@ DROP TABLE t1,t2;
CREATE TABLE t (f VARCHAR(512)); CREATE TABLE t (f VARCHAR(512));
INSERT INTO t VALUES ('a'),('b'); INSERT INTO t VALUES ('a'),('b');
SELECT * FROM t HAVING f = 'foo'; SELECT * FROM t HAVING f = 'foo';
DROP TABLE t;
# Cleanup --echo #
--echo # MDEV-29731 Crash when HAVING in a correlated subquery references
--echo # columns in the outer query
--echo #
CREATE TABLE t (a INT, b INT);
SELECT 1 FROM t
WHERE b = (SELECT 1 FROM t GROUP BY a HAVING b = a+1);
DROP TABLE t;
CREATE TABLE t (a INT, b INT, c INT);
SELECT 1 FROM t
WHERE (b,c) = (SELECT 1,1 FROM t GROUP BY a HAVING b = a+1 and c = a-1);
DROP TABLE t;
CREATE TABLE t (a TEXT, b INT UNIQUE);
SELECT 1 FROM t
WHERE b IN (SELECT 1 FROM t
GROUP BY '', a
HAVING (CASE b WHEN 1 +'' THEN 3 ELSE a END)
ORDER BY b)
GROUP BY b HAVING b = 1;
DROP TABLE t;
CREATE TABLE t (a INT, b CHAR KEY UNIQUE);
CREATE VIEW v AS SELECT * FROM t WHERE a LIKE '' GROUP BY b HAVING a > a;
SELECT * FROM v AS v1 NATURAL JOIN v AS v5 NATURAL JOIN v
WHERE a LIKE '' AND b IN (SELECT a FROM t
WHERE a LIKE ''
GROUP BY a
HAVING b LIKE (b < +1 OR a > 1) >= b);
DROP VIEW v;
DROP TABLE t;
EXECUTE IMMEDIATE 'SELECT LEAD(c) OVER (ORDER BY c)
FROM (SELECT 0 AS c) AS a NATURAL JOIN (SELECT 0 AS c) AS b;';
CREATE TABLE t (a INT);
UPDATE t SET a = ''
WHERE 1 IN (SELECT * FROM
(SELECT * FROM
(SELECT * FROM t AS v5 NATURAL JOIN t AS v4 NATURAL JOIN t) AS v3
NATURAL JOIN t
GROUP BY a) AS v2
WHERE (0, a) IN ((0,-1),(+1,0))
ORDER BY 1+AVG(a) OVER (ORDER BY a)) ORDER BY a;
DROP TABLE t; DROP TABLE t;
--echo # --echo #

57
mysql-test/main/log_slow.result
View File

@ -52,15 +52,15 @@ start_time timestamp(6) NO current_timestamp(6) on update current_timestamp(6)
user_host mediumtext NO NULL user_host mediumtext NO NULL
query_time time(6) NO NULL query_time time(6) NO NULL
lock_time time(6) NO NULL lock_time time(6) NO NULL
rows_sent int(11) NO NULL rows_sent bigint(20) unsigned NO NULL
rows_examined int(11) NO NULL rows_examined bigint(20) unsigned NO NULL
db varchar(512) NO NULL db varchar(512) NO NULL
last_insert_id int(11) NO NULL last_insert_id int(11) NO NULL
insert_id int(11) NO NULL insert_id int(11) NO NULL
server_id int(10) unsigned NO NULL server_id int(10) unsigned NO NULL
sql_text mediumtext NO NULL sql_text mediumtext NO NULL
thread_id bigint(21) unsigned NO NULL thread_id bigint(21) unsigned NO NULL
rows_affected int(11) NO NULL rows_affected bigint(20) unsigned NO NULL
flush slow logs; flush slow logs;
set long_query_time=0.1; set long_query_time=0.1;
set log_slow_filter=''; set log_slow_filter='';
@ -133,3 +133,54 @@ drop table t;
# #
# End of 10.3 tests # End of 10.3 tests
# #
#
# MDEV-31742: incorrect examined rows in case of stored function usage
#
CREATE TABLE `tab_MDEV_30820` (
`ID` int(11) NOT NULL AUTO_INCREMENT,
`NAME_F` varchar(50) DEFAULT NULL,
PRIMARY KEY (`ID`)
);
CREATE TABLE `tab2` (
`ID` int(11) NOT NULL AUTO_INCREMENT,
`TAB1_ID` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
);
CREATE FUNCTION `get_zero`() RETURNS int(11)
BEGIN
RETURN(0) ;
END
//
for i in 1..100 do insert into tab_MDEV_30820 values (i,'qwerty'); end for ; //
for i in 1..1000 do insert into tab2 values (i,i+300); end for ; //
SET @old_slow_query_log= @@global.slow_query_log;
SET @old_log_output= @@global.log_output;
SET @old_long_query_time= @@long_query_time;
SET GLOBAL log_output= "TABLE";
SET GLOBAL slow_query_log= ON;
SET SESSION slow_query_log=ON;
SET SESSION long_query_time= 0;
SELECT 0 as zero, (SELECT ID FROM tab2 where tab2.TAB1_ID =
tab_MDEV_30820.ID ORDER BY 1 LIMIT 1 ) AS F1 FROM tab_MDEV_30820 ORDER BY 2 DESC LIMIT 2;
zero F1
0 NULL
0 NULL
SELECT get_zero() as zero, (SELECT ID FROM tab2 where tab2.TAB1_ID =
tab_MDEV_30820.ID ORDER BY 1 LIMIT 1) AS F1 FROM tab_MDEV_30820 ORDER BY 2 DESC LIMIT 2;
zero F1
0 NULL
0 NULL
# should be the same rows_examined
SELECT rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%tab_MDEV_30820%';
rows_examined
100202
100202
SET @@long_query_time= @old_long_query_time;
SET @@global.log_output= @old_log_output;
SET @@global.slow_query_log= @old_slow_query_log;
SET SESSION slow_query_log=default;
drop table tab_MDEV_30820, tab2;
drop function get_zero;
#
# End of 10.4 tests
#

65
mysql-test/main/log_slow.test
View File

@ -121,3 +121,68 @@ drop table t;
--echo # --echo #
--echo # End of 10.3 tests --echo # End of 10.3 tests
--echo # --echo #
--echo #
--echo # MDEV-31742: incorrect examined rows in case of stored function usage
--echo #
CREATE TABLE `tab_MDEV_30820` (
`ID` int(11) NOT NULL AUTO_INCREMENT,
`NAME_F` varchar(50) DEFAULT NULL,
PRIMARY KEY (`ID`)
);
CREATE TABLE `tab2` (
`ID` int(11) NOT NULL AUTO_INCREMENT,
`TAB1_ID` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
);
--disable_ps2_protocol
--delimiter //
CREATE FUNCTION `get_zero`() RETURNS int(11)
BEGIN
RETURN(0) ;
END
//
for i in 1..100 do insert into tab_MDEV_30820 values (i,'qwerty'); end for ; //
for i in 1..1000 do insert into tab2 values (i,i+300); end for ; //
--delimiter ;
SET @old_slow_query_log= @@global.slow_query_log;
SET @old_log_output= @@global.log_output;
SET @old_long_query_time= @@long_query_time;
SET GLOBAL log_output= "TABLE";
SET GLOBAL slow_query_log= ON;
SET SESSION slow_query_log=ON;
SET SESSION long_query_time= 0;
SELECT 0 as zero, (SELECT ID FROM tab2 where tab2.TAB1_ID =
tab_MDEV_30820.ID ORDER BY 1 LIMIT 1 ) AS F1 FROM tab_MDEV_30820 ORDER BY 2 DESC LIMIT 2;
SELECT get_zero() as zero, (SELECT ID FROM tab2 where tab2.TAB1_ID =
tab_MDEV_30820.ID ORDER BY 1 LIMIT 1) AS F1 FROM tab_MDEV_30820 ORDER BY 2 DESC LIMIT 2;
--echo # should be the same rows_examined
SELECT rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%tab_MDEV_30820%';
## Reset to initial values
SET @@long_query_time= @old_long_query_time;
SET @@global.log_output= @old_log_output;
SET @@global.slow_query_log= @old_slow_query_log;
SET SESSION slow_query_log=default;
drop table tab_MDEV_30820, tab2;
drop function get_zero;
--enable_ps2_protocol
--echo #
--echo # End of 10.4 tests
--echo #

29
mysql-test/main/log_slow_debug.result
View File

@ -224,3 +224,32 @@ SET @@global.slow_query_log= @org_slow_query_log;
SET @@global.log_output= @org_log_output; SET @@global.log_output= @org_log_output;
SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements; SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
DROP PROCEDURE show_slow_log; DROP PROCEDURE show_slow_log;
#
# MDEV-30820: slow log Rows_examined out of range
#
CREATE TABLE `tab_MDEV_30820` (
`ID` int(11) NOT NULL AUTO_INCREMENT,
`A` int(11),
PRIMARY KEY(ID)
);
insert into tab_MDEV_30820 values (null, 0),(null, 0);
SET @old_slow_query_log= @@global.slow_query_log;
SET @old_log_output= @@global.log_output;
SET @old_long_query_time= @@long_query_time;
SET @old_dbug= @@GLOBAL.debug_dbug;
SET GLOBAL log_output= "TABLE";
SET GLOBAL slow_query_log= ON;
SET SESSION long_query_time= 0;
SET GLOBAL debug_dbug="+d,debug_huge_number_of_examined_rows";
SELECT * FROM tab_MDEV_30820 ORDER BY 1;
ID A
1 0
2 0
SET GLOBAL debug_dbug=@old_dbug;
SET @@long_query_time= @old_long_query_time;
SET @@global.log_output= @old_log_output;
SET @@global.slow_query_log= @old_slow_query_log;
drop table tab_MDEV_30820;
#
# End of 10.4 test
#

38
mysql-test/main/log_slow_debug.test
View File

@ -93,3 +93,41 @@ SET @@global.slow_query_log= @org_slow_query_log;
SET @@global.log_output= @org_log_output; SET @@global.log_output= @org_log_output;
SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements; SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
DROP PROCEDURE show_slow_log; DROP PROCEDURE show_slow_log;
--echo #
--echo # MDEV-30820: slow log Rows_examined out of range
--echo #
CREATE TABLE `tab_MDEV_30820` (
`ID` int(11) NOT NULL AUTO_INCREMENT,
`A` int(11),
PRIMARY KEY(ID)
);
insert into tab_MDEV_30820 values (null, 0),(null, 0);
SET @old_slow_query_log= @@global.slow_query_log;
SET @old_log_output= @@global.log_output;
SET @old_long_query_time= @@long_query_time;
SET @old_dbug= @@GLOBAL.debug_dbug;
SET GLOBAL log_output= "TABLE";
SET GLOBAL slow_query_log= ON;
SET SESSION long_query_time= 0;
SET GLOBAL debug_dbug="+d,debug_huge_number_of_examined_rows";
SELECT * FROM tab_MDEV_30820 ORDER BY 1;
SET GLOBAL debug_dbug=@old_dbug;
## Reset to initial values
SET @@long_query_time= @old_long_query_time;
SET @@global.log_output= @old_log_output;
SET @@global.slow_query_log= @old_slow_query_log;
drop table tab_MDEV_30820;
--echo #
--echo # End of 10.4 test
--echo #

36
mysql-test/main/log_tables.result
View File

@ -73,15 +73,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
show fields from mysql.slow_log; show fields from mysql.slow_log;
Field Type Null Key Default Extra Field Type Null Key Default Extra
@ -89,15 +89,15 @@ start_time timestamp(6) NO current_timestamp(6) on update current_timestamp(6)
user_host mediumtext NO NULL user_host mediumtext NO NULL
query_time time(6) NO NULL query_time time(6) NO NULL
lock_time time(6) NO NULL lock_time time(6) NO NULL
rows_sent int(11) NO NULL rows_sent bigint(20) unsigned NO NULL
rows_examined int(11) NO NULL rows_examined bigint(20) unsigned NO NULL
db varchar(512) NO NULL db varchar(512) NO NULL
last_insert_id int(11) NO NULL last_insert_id int(11) NO NULL
insert_id int(11) NO NULL insert_id int(11) NO NULL
server_id int(10) unsigned NO NULL server_id int(10) unsigned NO NULL
sql_text mediumtext NO NULL sql_text mediumtext NO NULL
thread_id bigint(21) unsigned NO NULL thread_id bigint(21) unsigned NO NULL
rows_affected int(11) NO NULL rows_affected bigint(20) unsigned NO NULL
flush logs; flush logs;
flush tables; flush tables;
SET GLOBAL GENERAL_LOG=ON; SET GLOBAL GENERAL_LOG=ON;
@ -180,15 +180,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
alter table mysql.general_log engine=myisam; alter table mysql.general_log engine=myisam;
alter table mysql.slow_log engine=myisam; alter table mysql.slow_log engine=myisam;
@ -209,15 +209,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
set global general_log='ON'; set global general_log='ON';
set global slow_query_log='ON'; set global slow_query_log='ON';
@ -287,15 +287,15 @@ ON UPDATE CURRENT_TIMESTAMP,
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` BIGINT(21) UNSIGNED NOT NULL, `thread_id` BIGINT(21) UNSIGNED NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
set global general_log='ON'; set global general_log='ON';
set global slow_query_log='ON'; set global slow_query_log='ON';
@ -580,15 +580,15 @@ CREATE TABLE `db_17876.slow_log_data` (
`user_host` mediumtext , `user_host` mediumtext ,
`query_time` time(6) , `query_time` time(6) ,
`lock_time` time(6) , `lock_time` time(6) ,
`rows_sent` int(11) , `rows_sent` bigint(20) unsigned,
`rows_examined` int(11) , `rows_examined` bigint(20) unsigned,
`db` varchar(512) default NULL, `db` varchar(512) default NULL,
`last_insert_id` int(11) default NULL, `last_insert_id` int(11) default NULL,
`insert_id` int(11) default NULL, `insert_id` int(11) default NULL,
`server_id` int(11) default NULL, `server_id` int(11) default NULL,
`sql_text` mediumtext, `sql_text` mediumtext,
`thread_id` bigint(21) unsigned default NULL, `thread_id` bigint(21) unsigned default NULL,
`rows_affected` int(11) default NULL `rows_affected` bigint(20) unsigned default NULL
); );
CREATE TABLE `db_17876.general_log_data` ( CREATE TABLE `db_17876.general_log_data` (
`event_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `event_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

12
mysql-test/main/log_tables.test
View File

@ -307,15 +307,15 @@ CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` BIGINT(21) UNSIGNED NOT NULL, `thread_id` BIGINT(21) UNSIGNED NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
set global general_log='ON'; set global general_log='ON';
@ -743,15 +743,15 @@ CREATE TABLE `db_17876.slow_log_data` (
`user_host` mediumtext , `user_host` mediumtext ,
`query_time` time(6) , `query_time` time(6) ,
`lock_time` time(6) , `lock_time` time(6) ,
`rows_sent` int(11) , `rows_sent` bigint(20) unsigned,
`rows_examined` int(11) , `rows_examined` bigint(20) unsigned,
`db` varchar(512) default NULL, `db` varchar(512) default NULL,
`last_insert_id` int(11) default NULL, `last_insert_id` int(11) default NULL,
`insert_id` int(11) default NULL, `insert_id` int(11) default NULL,
`server_id` int(11) default NULL, `server_id` int(11) default NULL,
`sql_text` mediumtext, `sql_text` mediumtext,
`thread_id` bigint(21) unsigned default NULL, `thread_id` bigint(21) unsigned default NULL,
`rows_affected` int(11) default NULL `rows_affected` bigint(20) unsigned default NULL
); );
CREATE TABLE `db_17876.general_log_data` ( CREATE TABLE `db_17876.general_log_data` (

30
mysql-test/main/mysqldump.result
View File

@ -5281,15 +5281,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
SET @@global.log_output= @old_log_output_state; SET @@global.log_output= @old_log_output_state;
SET @@global.slow_query_log= @old_slow_query_log_state; SET @@global.slow_query_log= @old_slow_query_log_state;
@ -5747,15 +5747,15 @@ CREATE TABLE IF NOT EXISTS `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log';
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `innodb_index_stats`; DROP TABLE IF EXISTS `innodb_index_stats`;
@ -5842,15 +5842,15 @@ CREATE TABLE IF NOT EXISTS `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log';
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `innodb_index_stats`; DROP TABLE IF EXISTS `innodb_index_stats`;
@ -5947,15 +5947,15 @@ CREATE TABLE IF NOT EXISTS `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log';
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `innodb_index_stats`; DROP TABLE IF EXISTS `innodb_index_stats`;
@ -6395,15 +6395,15 @@ DROP TABLE IF EXISTS mysql.column_stats;
<field Field="user_host" Type="mediumtext" Null="NO" Key="" Extra="" Comment="" /> <field Field="user_host" Type="mediumtext" Null="NO" Key="" Extra="" Comment="" />
<field Field="query_time" Type="time(6)" Null="NO" Key="" Extra="" Comment="" /> <field Field="query_time" Type="time(6)" Null="NO" Key="" Extra="" Comment="" />
<field Field="lock_time" Type="time(6)" Null="NO" Key="" Extra="" Comment="" /> <field Field="lock_time" Type="time(6)" Null="NO" Key="" Extra="" Comment="" />
<field Field="rows_sent" Type="int(11)" Null="NO" Key="" Extra="" Comment="" /> <field Field="rows_sent" Type="bigint(20) unsigned" Null="NO" Key="" Extra="" Comment="" />
<field Field="rows_examined" Type="int(11)" Null="NO" Key="" Extra="" Comment="" /> <field Field="rows_examined" Type="bigint(20) unsigned" Null="NO" Key="" Extra="" Comment="" />
<field Field="db" Type="varchar(512)" Null="NO" Key="" Extra="" Comment="" /> <field Field="db" Type="varchar(512)" Null="NO" Key="" Extra="" Comment="" />
<field Field="last_insert_id" Type="int(11)" Null="NO" Key="" Extra="" Comment="" /> <field Field="last_insert_id" Type="int(11)" Null="NO" Key="" Extra="" Comment="" />
<field Field="insert_id" Type="int(11)" Null="NO" Key="" Extra="" Comment="" /> <field Field="insert_id" Type="int(11)" Null="NO" Key="" Extra="" Comment="" />
<field Field="server_id" Type="int(10) unsigned" Null="NO" Key="" Extra="" Comment="" /> <field Field="server_id" Type="int(10) unsigned" Null="NO" Key="" Extra="" Comment="" />
<field Field="sql_text" Type="mediumtext" Null="NO" Key="" Extra="" Comment="" /> <field Field="sql_text" Type="mediumtext" Null="NO" Key="" Extra="" Comment="" />
<field Field="thread_id" Type="bigint(21) unsigned" Null="NO" Key="" Extra="" Comment="" /> <field Field="thread_id" Type="bigint(21) unsigned" Null="NO" Key="" Extra="" Comment="" />
<field Field="rows_affected" Type="int(11)" Null="NO" Key="" Extra="" Comment="" /> <field Field="rows_affected" Type="bigint(20) unsigned" Null="NO" Key="" Extra="" Comment="" />
<options Name="slow_log" Engine="CSV" Version="10" Row_format="Dynamic" Rows="2" Avg_row_length="0" Data_length="0" Max_data_length="0" Index_length="0" Data_free="0" Collation="utf8_general_ci" Create_options="" Comment="Slow log" Max_index_length="0" Temporary="N" /> <options Name="slow_log" Engine="CSV" Version="10" Row_format="Dynamic" Rows="2" Avg_row_length="0" Data_length="0" Max_data_length="0" Index_length="0" Data_free="0" Collation="utf8_general_ci" Create_options="" Comment="Slow log" Max_index_length="0" Temporary="N" />
</table_structure> </table_structure>

6
mysql-test/main/system_mysql_db.result
View File

@ -204,15 +204,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
show create table table_stats; show create table table_stats;
Table Create Table Table Create Table

6
mysql-test/main/system_mysql_db_fix40123.result
View File

@ -242,15 +242,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
show create table table_stats; show create table table_stats;
Table Create Table Table Create Table

6
mysql-test/main/system_mysql_db_fix50030.result
View File

@ -246,15 +246,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
show create table table_stats; show create table table_stats;
Table Create Table Table Create Table

6
mysql-test/main/system_mysql_db_fix50117.result
View File

@ -226,15 +226,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
show create table table_stats; show create table table_stats;
Table Create Table Table Create Table

6
mysql-test/main/system_mysql_db_fix50568.result
View File

@ -247,15 +247,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
show create table table_stats; show create table table_stats;
Table Create Table Table Create Table

12
mysql-test/suite/funcs_1/r/is_columns_mysql.result
View File

@ -171,9 +171,9 @@ def mysql slow_log insert_id 9 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11)
def mysql slow_log last_insert_id 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NEVER NULL def mysql slow_log last_insert_id 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NEVER NULL
def mysql slow_log lock_time 4 NULL NO time NULL NULL NULL NULL 6 NULL NULL time(6) select,insert,update,references NEVER NULL def mysql slow_log lock_time 4 NULL NO time NULL NULL NULL NULL 6 NULL NULL time(6) select,insert,update,references NEVER NULL
def mysql slow_log query_time 3 NULL NO time NULL NULL NULL NULL 6 NULL NULL time(6) select,insert,update,references NEVER NULL def mysql slow_log query_time 3 NULL NO time NULL NULL NULL NULL 6 NULL NULL time(6) select,insert,update,references NEVER NULL
def mysql slow_log rows_affected 13 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NEVER NULL def mysql slow_log rows_affected 13 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL
def mysql slow_log rows_examined 6 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NEVER NULL def mysql slow_log rows_examined 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL
def mysql slow_log rows_sent 5 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references NEVER NULL def mysql slow_log rows_sent 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL
def mysql slow_log server_id 10 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references NEVER NULL def mysql slow_log server_id 10 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references NEVER NULL
def mysql slow_log sql_text 11 NULL NO mediumtext 16777215 16777215 NULL NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references NEVER NULL def mysql slow_log sql_text 11 NULL NO mediumtext 16777215 16777215 NULL NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references NEVER NULL
def mysql slow_log start_time 1 current_timestamp(6) NO timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) on update current_timestamp(6) select,insert,update,references NEVER NULL def mysql slow_log start_time 1 current_timestamp(6) NO timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) on update current_timestamp(6) select,insert,update,references NEVER NULL
@ -497,15 +497,15 @@ NULL mysql slow_log start_time timestamp NULL NULL NULL NULL timestamp(6)
1.0000 mysql slow_log user_host mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext 1.0000 mysql slow_log user_host mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext
NULL mysql slow_log query_time time NULL NULL NULL NULL time(6) NULL mysql slow_log query_time time NULL NULL NULL NULL time(6)
NULL mysql slow_log lock_time time NULL NULL NULL NULL time(6) NULL mysql slow_log lock_time time NULL NULL NULL NULL time(6)
NULL mysql slow_log rows_sent int NULL NULL NULL NULL int(11) NULL mysql slow_log rows_sent bigint NULL NULL NULL NULL bigint(20) unsigned
NULL mysql slow_log rows_examined int NULL NULL NULL NULL int(11) NULL mysql slow_log rows_examined bigint NULL NULL NULL NULL bigint(20) unsigned
3.0000 mysql slow_log db varchar 512 1536 utf8 utf8_general_ci varchar(512) 3.0000 mysql slow_log db varchar 512 1536 utf8 utf8_general_ci varchar(512)
NULL mysql slow_log last_insert_id int NULL NULL NULL NULL int(11) NULL mysql slow_log last_insert_id int NULL NULL NULL NULL int(11)
NULL mysql slow_log insert_id int NULL NULL NULL NULL int(11) NULL mysql slow_log insert_id int NULL NULL NULL NULL int(11)
NULL mysql slow_log server_id int NULL NULL NULL NULL int(10) unsigned NULL mysql slow_log server_id int NULL NULL NULL NULL int(10) unsigned
1.0000 mysql slow_log sql_text mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext 1.0000 mysql slow_log sql_text mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext
NULL mysql slow_log thread_id bigint NULL NULL NULL NULL bigint(21) unsigned NULL mysql slow_log thread_id bigint NULL NULL NULL NULL bigint(21) unsigned
NULL mysql slow_log rows_affected int NULL NULL NULL NULL int(11) NULL mysql slow_log rows_affected bigint NULL NULL NULL NULL bigint(20) unsigned
3.0000 mysql tables_priv Host char 60 180 utf8 utf8_bin char(60) 3.0000 mysql tables_priv Host char 60 180 utf8 utf8_bin char(60)
3.0000 mysql tables_priv Db char 64 192 utf8 utf8_bin char(64) 3.0000 mysql tables_priv Db char 64 192 utf8 utf8_bin char(64)
3.0000 mysql tables_priv User char 80 240 utf8 utf8_bin char(80) 3.0000 mysql tables_priv User char 80 240 utf8 utf8_bin char(80)

12
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
View File

@ -157,9 +157,9 @@ def mysql slow_log insert_id 9 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11)
def mysql slow_log last_insert_id 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) NEVER NULL def mysql slow_log last_insert_id 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) NEVER NULL
def mysql slow_log lock_time 4 NULL NO time NULL NULL NULL NULL 6 NULL NULL time(6) NEVER NULL def mysql slow_log lock_time 4 NULL NO time NULL NULL NULL NULL 6 NULL NULL time(6) NEVER NULL
def mysql slow_log query_time 3 NULL NO time NULL NULL NULL NULL 6 NULL NULL time(6) NEVER NULL def mysql slow_log query_time 3 NULL NO time NULL NULL NULL NULL 6 NULL NULL time(6) NEVER NULL
def mysql slow_log rows_affected 13 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) NEVER NULL def mysql slow_log rows_affected 13 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned NEVER NULL
def mysql slow_log rows_examined 6 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) NEVER NULL def mysql slow_log rows_examined 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned NEVER NULL
def mysql slow_log rows_sent 5 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) NEVER NULL def mysql slow_log rows_sent 5 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned NEVER NULL
def mysql slow_log server_id 10 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned NEVER NULL def mysql slow_log server_id 10 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned NEVER NULL
def mysql slow_log sql_text 11 NULL NO mediumtext 16777215 16777215 NULL NULL NULL utf8 utf8_general_ci mediumtext NEVER NULL def mysql slow_log sql_text 11 NULL NO mediumtext 16777215 16777215 NULL NULL NULL utf8 utf8_general_ci mediumtext NEVER NULL
def mysql slow_log start_time 1 current_timestamp(6) NO timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) on update current_timestamp(6) NEVER NULL def mysql slow_log start_time 1 current_timestamp(6) NO timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) on update current_timestamp(6) NEVER NULL
@ -480,15 +480,15 @@ NULL mysql slow_log start_time timestamp NULL NULL NULL NULL timestamp(6)
1.0000 mysql slow_log user_host mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext 1.0000 mysql slow_log user_host mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext
NULL mysql slow_log query_time time NULL NULL NULL NULL time(6) NULL mysql slow_log query_time time NULL NULL NULL NULL time(6)
NULL mysql slow_log lock_time time NULL NULL NULL NULL time(6) NULL mysql slow_log lock_time time NULL NULL NULL NULL time(6)
NULL mysql slow_log rows_sent int NULL NULL NULL NULL int(11) NULL mysql slow_log rows_sent bigint NULL NULL NULL NULL bigint(20) unsigned
NULL mysql slow_log rows_examined int NULL NULL NULL NULL int(11) NULL mysql slow_log rows_examined bigint NULL NULL NULL NULL bigint(20) unsigned
3.0000 mysql slow_log db varchar 512 1536 utf8 utf8_general_ci varchar(512) 3.0000 mysql slow_log db varchar 512 1536 utf8 utf8_general_ci varchar(512)
NULL mysql slow_log last_insert_id int NULL NULL NULL NULL int(11) NULL mysql slow_log last_insert_id int NULL NULL NULL NULL int(11)
NULL mysql slow_log insert_id int NULL NULL NULL NULL int(11) NULL mysql slow_log insert_id int NULL NULL NULL NULL int(11)
NULL mysql slow_log server_id int NULL NULL NULL NULL int(10) unsigned NULL mysql slow_log server_id int NULL NULL NULL NULL int(10) unsigned
1.0000 mysql slow_log sql_text mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext 1.0000 mysql slow_log sql_text mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext
NULL mysql slow_log thread_id bigint NULL NULL NULL NULL bigint(21) unsigned NULL mysql slow_log thread_id bigint NULL NULL NULL NULL bigint(21) unsigned
NULL mysql slow_log rows_affected int NULL NULL NULL NULL int(11) NULL mysql slow_log rows_affected bigint NULL NULL NULL NULL bigint(20) unsigned
3.0000 mysql tables_priv Host char 60 180 utf8 utf8_bin char(60) 3.0000 mysql tables_priv Host char 60 180 utf8 utf8_bin char(60)
3.0000 mysql tables_priv Db char 64 192 utf8 utf8_bin char(64) 3.0000 mysql tables_priv Db char 64 192 utf8 utf8_bin char(64)
3.0000 mysql tables_priv User char 80 240 utf8 utf8_bin char(80) 3.0000 mysql tables_priv User char 80 240 utf8 utf8_bin char(80)

10
mysql-test/suite/rpl/r/rpl_mysql_upgrade.result
View File

@ -28,8 +28,8 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
@ -48,15 +48,15 @@ slow_log CREATE TABLE `slow_log` (
`user_host` mediumtext NOT NULL, `user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL, `query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL, `lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` bigint(20) unsigned NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` bigint(20) unsigned NOT NULL,
`db` varchar(512) NOT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL, `sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL, `thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL `rows_affected` bigint(20) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'
SET GLOBAL general_log = 'OFF'; SET GLOBAL general_log = 'OFF';
SET GLOBAL slow_query_log = 'OFF'; SET GLOBAL slow_query_log = 'OFF';

2
scripts/mysql_system_tables.sql
View File

@ -162,7 +162,7 @@ DROP PREPARE stmt;
-- Create slow_log if CSV is enabled. -- Create slow_log if CSV is enabled.
SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, user_host MEDIUMTEXT NOT NULL, query_time TIME(6) NOT NULL, lock_time TIME(6) NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, sql_text MEDIUMTEXT NOT NULL, thread_id BIGINT(21) UNSIGNED NOT NULL, rows_affected INTEGER NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0'); SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, user_host MEDIUMTEXT NOT NULL, query_time TIME(6) NOT NULL, lock_time TIME(6) NOT NULL, rows_sent BIGINT UNSIGNED NOT NULL, rows_examined BIGINT UNSIGNED NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, sql_text MEDIUMTEXT NOT NULL, thread_id BIGINT(21) UNSIGNED NOT NULL, rows_affected BIGINT UNSIGNED NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0');
PREPARE stmt FROM @str; PREPARE stmt FROM @str;
EXECUTE stmt; EXECUTE stmt;

16
scripts/mysql_system_tables_fix.sql
View File

@ -247,23 +247,23 @@ SET GLOBAL general_log = @old_log_state;
SET @old_log_state = @@global.slow_query_log; SET @old_log_state = @@global.slow_query_log;
SET GLOBAL slow_query_log = 'OFF'; SET GLOBAL slow_query_log = 'OFF';
ALTER TABLE slow_log
ADD COLUMN thread_id BIGINT(21) UNSIGNED NOT NULL AFTER sql_text;
ALTER TABLE slow_log
ADD COLUMN rows_affected INTEGER NOT NULL AFTER thread_id;
ALTER TABLE slow_log ALTER TABLE slow_log
MODIFY start_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, MODIFY start_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
MODIFY user_host MEDIUMTEXT NOT NULL, MODIFY user_host MEDIUMTEXT NOT NULL,
MODIFY query_time TIME(6) NOT NULL, MODIFY query_time TIME(6) NOT NULL,
MODIFY lock_time TIME(6) NOT NULL, MODIFY lock_time TIME(6) NOT NULL,
MODIFY rows_sent INTEGER NOT NULL, MODIFY rows_sent BIGINT UNSIGNED NOT NULL,
MODIFY rows_examined INTEGER NOT NULL, MODIFY rows_examined BIGINT UNSIGNED NOT NULL,
MODIFY db VARCHAR(512) NOT NULL, MODIFY db VARCHAR(512) NOT NULL,
MODIFY last_insert_id INTEGER NOT NULL, MODIFY last_insert_id INTEGER NOT NULL,
MODIFY insert_id INTEGER NOT NULL, MODIFY insert_id INTEGER NOT NULL,
MODIFY server_id INTEGER UNSIGNED NOT NULL, MODIFY server_id INTEGER UNSIGNED NOT NULL,
MODIFY sql_text MEDIUMTEXT NOT NULL, MODIFY sql_text MEDIUMTEXT NOT NULL;
MODIFY thread_id BIGINT(21) UNSIGNED NOT NULL; ALTER TABLE slow_log
ADD COLUMN thread_id BIGINT(21) UNSIGNED NOT NULL AFTER sql_text;
ALTER TABLE slow_log
MODIFY thread_id BIGINT(21) UNSIGNED NOT NULL,
ADD COLUMN rows_affected BIGINT UNSIGNED NOT NULL AFTER thread_id;
SET GLOBAL slow_query_log = @old_log_state; SET GLOBAL slow_query_log = @old_log_state;
ALTER TABLE plugin ALTER TABLE plugin

2
scripts/wsrep_sst_mysqldump.sh
View File

@ -85,7 +85,7 @@ PREPARE stmt FROM @stmt;
EXECUTE stmt; EXECUTE stmt;
DROP PREPARE stmt; DROP PREPARE stmt;
SET @stmt = IF (@cond = '1', 'CREATE TABLE IF NOT EXISTS slow_log ( start_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), user_host mediumtext NOT NULL, query_time time(6) NOT NULL, lock_time time(6) NOT NULL, rows_sent int(11) NOT NULL, rows_examined int(11) NOT NULL, db varchar(512) NOT NULL, last_insert_id int(11) NOT NULL, insert_id int(11) NOT NULL, server_id int(10) unsigned NOT NULL, sql_text mediumtext NOT NULL, thread_id bigint(21) unsigned NOT NULL) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT=\"Slow log\"', 'SET @dummy = 0'); SET @stmt = IF (@cond = '1', 'CREATE TABLE IF NOT EXISTS slow_log ( start_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), user_host mediumtext NOT NULL, query_time time(6) NOT NULL, lock_time time(6) NOT NULL, rows_sent bigint(20) UNSIGNED NOT NULL, rows_examined bigint(20) UNSIGNED NOT NULL, db varchar(512) NOT NULL, last_insert_id int(11) NOT NULL, insert_id int(11) NOT NULL, server_id int(10) unsigned NOT NULL, sql_text mediumtext NOT NULL, thread_id bigint(21) unsigned NOT NULL) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT=\"Slow log\"', 'SET @dummy = 0');
PREPARE stmt FROM @stmt; PREPARE stmt FROM @stmt;
EXECUTE stmt; EXECUTE stmt;

2
sql/item.cc
View File

@ -8092,7 +8092,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
if (from_field != not_found_field) if (from_field != not_found_field)
{ {
Item_field* fld; Item_field* fld;
if (!(fld= new (thd->mem_root) Item_field(thd, from_field))) if (!(fld= new (thd->mem_root) Item_field(thd, context, from_field)))
goto error; goto error;
thd->change_item_tree(reference, fld); thd->change_item_tree(reference, fld);
mark_as_dependent(thd, last_checked_context->select_lex, mark_as_dependent(thd, last_checked_context->select_lex,

5
sql/sql_class.cc
View File

@ -68,8 +68,6 @@
#include "wsrep_thd.h" #include "wsrep_thd.h"
#include "wsrep_trans_observer.h" #include "wsrep_trans_observer.h"
#include "wsrep_server_state.h" #include "wsrep_server_state.h"
#else
static inline bool wsrep_is_bf_aborted(THD* thd) { return false; }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
#include "opt_trace.h" #include "opt_trace.h"
#include <mysql/psi/mysql_transaction.h> #include <mysql/psi/mysql_transaction.h>
@ -5804,7 +5802,6 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
The following is added to the old values as we are interested in the The following is added to the old values as we are interested in the
total complexity of the query total complexity of the query
*/ */
inc_examined_row_count(backup->examined_row_count);
cuted_fields+= backup->cuted_fields; cuted_fields+= backup->cuted_fields;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@ -5882,6 +5879,8 @@ void THD::set_examined_row_count(ha_rows count)
void THD::inc_sent_row_count(ha_rows count) void THD::inc_sent_row_count(ha_rows count)
{ {
m_sent_row_count+= count; m_sent_row_count+= count;
DBUG_EXECUTE_IF("debug_huge_number_of_examined_rows",
m_examined_row_count= (ULONGLONG_MAX - 1000000););
MYSQL_SET_STATEMENT_ROWS_SENT(m_statement_psi, m_sent_row_count); MYSQL_SET_STATEMENT_ROWS_SENT(m_statement_psi, m_sent_row_count);
} }

9
sql/sql_tvc.cc
View File

@ -258,7 +258,7 @@ bool table_value_constr::prepare(THD *thd, SELECT_LEX *sl,
List_item *first_elem= li++; List_item *first_elem= li++;
uint cnt= first_elem->elements; uint cnt= first_elem->elements;
Type_holder *holders; Type_holder *holders= type_holders;
if (cnt == 0) if (cnt == 0)
{ {
@ -269,12 +269,14 @@ bool table_value_constr::prepare(THD *thd, SELECT_LEX *sl,
if (fix_fields_for_tvc(thd, li)) if (fix_fields_for_tvc(thd, li))
DBUG_RETURN(true); DBUG_RETURN(true);
if (!(holders= new (thd->stmt_arena->mem_root) Type_holder[cnt]) || if (!holders)
{
holders= type_holders= new (thd->stmt_arena->mem_root) Type_holder[cnt];
if (!holders ||
join_type_handlers_for_tvc(thd, li, holders, cnt) || join_type_handlers_for_tvc(thd, li, holders, cnt) ||
get_type_attributes_for_tvc(thd, li, holders, get_type_attributes_for_tvc(thd, li, holders,
lists_of_values.elements, cnt)) lists_of_values.elements, cnt))
DBUG_RETURN(true); DBUG_RETURN(true);
List_iterator_fast<Item> it(*first_elem); List_iterator_fast<Item> it(*first_elem);
Item *item; Item *item;
Query_arena *arena, backup; Query_arena *arena, backup;
@ -295,6 +297,7 @@ bool table_value_constr::prepare(THD *thd, SELECT_LEX *sl,
if (unlikely(thd->is_fatal_error)) if (unlikely(thd->is_fatal_error))
DBUG_RETURN(true); // out of memory DBUG_RETURN(true); // out of memory
}
result= tmp_result; result= tmp_result;

4
sql/sql_tvc.h
View File

@ -25,6 +25,7 @@ class Explain_query;
class Item_func_in; class Item_func_in;
class st_select_lex_unit; class st_select_lex_unit;
typedef class st_select_lex SELECT_LEX; typedef class st_select_lex SELECT_LEX;
class Type_holder;
/** /**
@class table_value_constr @class table_value_constr
@ -39,6 +40,7 @@ public:
List<List_item> lists_of_values; List<List_item> lists_of_values;
select_result *result; select_result *result;
SELECT_LEX *select_lex; SELECT_LEX *select_lex;
Type_holder *type_holders;
enum { QEP_NOT_PRESENT_YET, QEP_AVAILABLE} have_query_plan; enum { QEP_NOT_PRESENT_YET, QEP_AVAILABLE} have_query_plan;
@ -47,7 +49,7 @@ public:
table_value_constr(List<List_item> tvc_values, SELECT_LEX *sl, table_value_constr(List<List_item> tvc_values, SELECT_LEX *sl,
ulonglong select_options_arg) : ulonglong select_options_arg) :
lists_of_values(tvc_values), result(0), select_lex(sl), lists_of_values(tvc_values), result(0), select_lex(sl), type_holders(0),
have_query_plan(QEP_NOT_PRESENT_YET), explain(0), have_query_plan(QEP_NOT_PRESENT_YET), explain(0),
select_options(select_options_arg) select_options(select_options_arg)
{ }; { };

36
storage/innobase/os/os0file.cc
View File

@ -4060,36 +4060,40 @@ static bool is_volume_on_ssd(const char *volume_mount_point)
} }
#include <unordered_map> #include <unordered_map>
static bool is_file_on_ssd(char *file_path) static bool is_path_on_ssd(char *file_path)
{ {
/* Cache of volume_path => volume_info, protected by rwlock.*/
static std::unordered_map<std::string, bool> cache;
static SRWLOCK lock= SRWLOCK_INIT;
/* Preset result, in case something fails, e.g we're on network drive.*/ /* Preset result, in case something fails, e.g we're on network drive.*/
char volume_path[MAX_PATH]; char volume_path[MAX_PATH];
if (!GetVolumePathName(file_path, volume_path, array_elements(volume_path))) if (!GetVolumePathName(file_path, volume_path, array_elements(volume_path)))
return false; return false;
return is_volume_on_ssd(volume_path);
}
/* Try cached volume info first.*/ static bool is_file_on_ssd(HANDLE handle, char *file_path)
std::string volume_path_str(volume_path); {
ULONGLONG volume_serial_number;
FILE_ID_INFO info;
if(!GetFileInformationByHandleEx(handle, FileIdInfo, &info, sizeof(info)))
return false;
volume_serial_number= info.VolumeSerialNumber;
static std::unordered_map<ULONGLONG, bool> cache;
static SRWLOCK lock= SRWLOCK_INIT;
bool found; bool found;
bool result; bool result;
AcquireSRWLockShared(&lock); AcquireSRWLockShared(&lock);
auto e= cache.find(volume_path_str); auto e= cache.find(volume_serial_number);
if ((found= e != cache.end())) if ((found= e != cache.end()))
result= e->second; result= e->second;
ReleaseSRWLockShared(&lock); ReleaseSRWLockShared(&lock);
if (!found)
if (found) {
return result; result= is_path_on_ssd(file_path);
result= is_volume_on_ssd(volume_path);
/* Update cache */ /* Update cache */
AcquireSRWLockExclusive(&lock); AcquireSRWLockExclusive(&lock);
cache[volume_path_str]= result; cache[volume_serial_number]= result;
ReleaseSRWLockExclusive(&lock); ReleaseSRWLockExclusive(&lock);
}
return result; return result;
} }
@ -4129,7 +4133,7 @@ void fil_node_t::find_metadata(os_file_t file
space->atomic_write_supported = space->purpose == FIL_TYPE_TEMPORARY space->atomic_write_supported = space->purpose == FIL_TYPE_TEMPORARY
|| space->purpose == FIL_TYPE_IMPORT; || space->purpose == FIL_TYPE_IMPORT;
#ifdef _WIN32 #ifdef _WIN32
on_ssd = is_file_on_ssd(name); on_ssd = is_file_on_ssd(file, name);
FILE_STORAGE_INFO info; FILE_STORAGE_INFO info;
if (GetFileInformationByHandleEx( if (GetFileInformationByHandleEx(
file, FileStorageInfo, &info, sizeof(info))) { file, FileStorageInfo, &info, sizeof(info))) {

5
storage/rocksdb/CMakeLists.txt
View File

@ -1,5 +1,10 @@
# TODO: Copyrights # TODO: Copyrights
IF(PLUGIN_ROCKSDB STREQUAL "NO")
ADD_FEATURE_INFO(ROCKSDB "OFF" "Storage Engine")
RETURN()
ENDIF()
SET(CPACK_RPM_rocksdb-engine_PACKAGE_SUMMARY "RocksDB storage engine for MariaDB server" PARENT_SCOPE) SET(CPACK_RPM_rocksdb-engine_PACKAGE_SUMMARY "RocksDB storage engine for MariaDB server" PARENT_SCOPE)
SET(CPACK_RPM_rocksdb-engine_PACKAGE_DESCRIPTION "The RocksDB storage engine is a high performance storage engine, aimed SET(CPACK_RPM_rocksdb-engine_PACKAGE_DESCRIPTION "The RocksDB storage engine is a high performance storage engine, aimed
at maximising storage efficiency while maintaining InnoDB-like performance." PARENT_SCOPE) at maximising storage efficiency while maintaining InnoDB-like performance." PARENT_SCOPE)

99
storage/spider/mysql-test/spider/include/deinit_spider.inc
View File

@ -1,93 +1,8 @@
let $SERVER_NAME=
`SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(version(), '-', 2), '-', -1)`;
let $SERVER_MAJOR_VERSION=
`SELECT SUBSTRING_INDEX(version(), '.', 1)`;
let $SERVER_MINOR_VERSION=
`SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(version(), '.', 2), '.', -1)`;
let $PLUGIN_VERSION=
`SELECT SUBSTRING_INDEX(plugin_version, '.', 1)
FROM information_schema.plugins
WHERE plugin_name = 'SPIDER'`;
if (`SELECT IF($PLUGIN_VERSION = 3, 1, 0)`)
{
let $HAS_REWRITE=
`SELECT IF (STRCMP('$SERVER_NAME', 'MariaDB') = 0,
IF ($SERVER_MAJOR_VERSION = 10,
IF ($SERVER_MINOR_VERSION < 4, 0, 1),
IF ($SERVER_MAJOR_VERSION < 10, 0, 1)),
0)`;
let $HAS_REWRITE= 0;
if ($HAS_REWRITE)
{
DROP FUNCTION spider_flush_rewrite_cache;
UNINSTALL PLUGIN spider_rewrite;
DROP TABLE IF EXISTS mysql.spider_rewrite_tables;
DROP TABLE IF EXISTS mysql.spider_rewrite_table_tables;
DROP TABLE IF EXISTS mysql.spider_rewrite_table_partitions;
DROP TABLE IF EXISTS mysql.spider_rewrite_table_subpartitions;
DROP TABLE IF EXISTS mysql.spider_rewritten_tables;
}
}
--source clean_up_spider.inc --source clean_up_spider.inc
if ($VERSION_COMPILE_OS_WIN) DROP SERVER IF EXISTS s_1;
{ DROP SERVER IF EXISTS s_2_1;
if ($MASTER_1_MYPORT) DROP SERVER IF EXISTS s_2_2;
{ DROP SERVER IF EXISTS s_2_3;
DROP SERVER s_1; DROP SERVER IF EXISTS s_3_1;
} DROP SERVER IF EXISTS s_3_2;
if ($CHILD2_1_MYPORT) DROP SERVER IF EXISTS s_3_3;
{
DROP SERVER s_2_1;
}
if ($CHILD2_2_MYPORT)
{
DROP SERVER s_2_2;
}
if ($CHILD2_3_MYPORT)
{
DROP SERVER s_2_3;
}
if ($CHILD3_1_MYPORT)
{
DROP SERVER s_3_1;
}
if ($CHILD3_2_MYPORT)
{
DROP SERVER s_3_2;
}
if ($CHILD2_3_MYPORT)
{
DROP SERVER s_3_3;
}
}
if (!$VERSION_COMPILE_OS_WIN)
{
if ($MASTER_1_MYSOCK)
{
DROP SERVER s_1;
}
if ($CHILD2_1_MYSOCK)
{
DROP SERVER s_2_1;
}
if ($CHILD2_2_MYSOCK)
{
DROP SERVER s_2_2;
}
if ($CHILD2_3_MYSOCK)
{
DROP SERVER s_2_3;
}
if ($CHILD3_1_MYSOCK)
{
DROP SERVER s_3_1;
}
if ($CHILD3_2_MYSOCK)
{
DROP SERVER s_3_2;
}
if ($CHILD3_3_MYSOCK)
{
DROP SERVER s_3_3;
}
}