mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	SHOW STATUS are not anymore put in slow query log because of no index usage. Implemntation done by removing orig_sql_command and moving logic of SHOW STATUS to mysql_excute_command() This simplifies code and allows us to remove some if statements all over the code. Upgraded uc_update_queries[] to sql_command_flags and added more bitmaps to better categorize commands. This allowed some overall simplifaction when testing sql_command. Fixes bugs: Bug#10210: running SHOW STATUS increments counters it shouldn't Bug#19764: SHOW commands end up in the slow log as table scans mysql-test/r/grant_cache.result: Fixed results after SHOW STATUS doesn't anymore affect status variables mysql-test/r/information_schema.result: Added extra test to cover more code mysql-test/r/query_cache.result: Remove resuts from previous tests mysql-test/r/status.result: Added more tests for testing of last_query_cost and how SHOW STATUS affects status variables. (Bug#10210) mysql-test/r/temp_table.result: Fixed results after SHOW STATUS doesn't anymore affect status variables mysql-test/r/union.result: Fixed results after SHOW STATUS is not logged to slow query log (Bug#19764) mysql-test/t/events_microsec.test: Disable warnings at init mysql-test/t/information_schema.test: Added extra test to cover more code mysql-test/t/query_cache.test: Remove resuts from previous tests mysql-test/t/status.test: Added more tests for testing of last_query_cost and how SHOW STATUS affects status variables. (Bug #10210) sql/mysql_priv.h: Added 'sql_command_flags' sql/sql_class.cc: New function add_diff_to_status(), used to update global status variables when using SHOW STATUS sql/sql_class.h: New function 'fill_information_schema_tables()' (One could not anymore use fill_derived_tables() for this as only_view_structures() is not relevant for information schema tables) Added defines for bit flags in sql_command_flags[] sql/sql_lex.cc: Remove orig_sql_command sql/sql_lex.h: Remove orig_sql_command sql/sql_parse.cc: Rename uc_update_queries -> sql_command_flags. Enhanced 'sql_command_flags' to better classify SQL commands uc_update_queries[] != 0 is changed to (sql_command_flags[] & CF_CHANGES_DATA) lex->orig_sql_command == SQLCOM_END is changed to (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) == 0) Simplify incrementing of thd->status_var.com_stat[] as we don't have to do special handling for SHOW commands. Split SQLCOM_SELECT handling in mysql_execute_command() to a separate function. Added special handling of SHOW STATUS commands in mysql_execute_command() and call common SQLCOM_SELECT handling. These changes allows us to easily fix that we save and restore status variables during execution of a SHOW STATUS command. Don't log SHOW STATUS commands to slow query log. This fixes Bug#10210 and Bug#19764 without adding additional 'if' code. (The new code is faster than the original as we now have fewer if's than before) sql/sql_prepare.cc: Clean up prepare-check handling of SQLCOM commands by using sql_command_flags[] This simplifes code and ensures that code works even if someone forgets to put a new status commands into the switch statement. sql/sql_select.cc: Remove special handling of SHOW STATUS. (This is now done in SQLCOM_SHOW_STATUS part in mysql_execute_command()) sql/sql_show.cc: Remove orig_sql_command Only change sql_command during 'open_normal_and_derived_tables()' (for views) and not for the full duration of generating data. Changed 'show status' to use thd->initial_status_var to ensure that the current statement is not affecting the to-be-used values. Use thd->fill_information_schema_tables() instead of 'thd->fill_derived_tables()' as the later wrongly checks the value of sql_command. sql/sql_yacc.yy: Remove usage of orig_sql_command. One side effect of this is that we need to test for cursors if the current command is a SELECT or a SHOW command. sql/structs.h: Updated comment
		
			
				
	
	
		
			149 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			149 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| drop table if exists t1,t2;
 | |
| drop view if exists v1;
 | |
| CREATE TABLE t1 (c int not null, d char (10) not null);
 | |
| insert into t1 values(1,""),(2,"a"),(3,"b");
 | |
| CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);
 | |
| insert into t1 values(4,"e"),(5,"f"),(6,"g");
 | |
| alter table t1 rename t2;
 | |
| select * from t1;
 | |
| c	d
 | |
| 1	
 | |
| 2	a
 | |
| 3	b
 | |
| select * from t2;
 | |
| a	b
 | |
| 4	e
 | |
| 5	f
 | |
| 6	g
 | |
| CREATE TABLE t2 (x int not null, y int not null);
 | |
| alter table t2 rename t1;
 | |
| select * from t1;
 | |
| a	b
 | |
| 4	e
 | |
| 5	f
 | |
| 6	g
 | |
| create TEMPORARY TABLE t2 engine=heap select * from t1;
 | |
| create TEMPORARY TABLE IF NOT EXISTS t2 (a int) engine=heap;
 | |
| Warnings:
 | |
| Note	1050	Table 't2' already exists
 | |
| CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);
 | |
| ERROR 42S01: Table 't1' already exists
 | |
| ALTER TABLE t1 RENAME t2;
 | |
| ERROR 42S01: Table 't2' already exists
 | |
| select * from t2;
 | |
| a	b
 | |
| 4	e
 | |
| 5	f
 | |
| 6	g
 | |
| alter table t2 add primary key (a,b);
 | |
| drop table t1,t2;
 | |
| select * from t1;
 | |
| c	d
 | |
| 1	
 | |
| 2	a
 | |
| 3	b
 | |
| drop table t2;
 | |
| create temporary table t1 select *,2 as "e" from t1;
 | |
| select * from t1;
 | |
| c	d	e
 | |
| 1		2
 | |
| 2	a	2
 | |
| 3	b	2
 | |
| drop table t1;
 | |
| drop table t1;
 | |
| CREATE TABLE t1 (pkCrash INTEGER PRIMARY KEY,strCrash VARCHAR(255));
 | |
| INSERT INTO t1 ( pkCrash, strCrash ) VALUES ( 1, '1');
 | |
| SELECT CONCAT_WS(pkCrash, strCrash) FROM t1;
 | |
| CONCAT_WS(pkCrash, strCrash)
 | |
| 1
 | |
| drop table t1;
 | |
| create temporary table t1 select 1 as 'x';
 | |
| drop table t1;
 | |
| CREATE TABLE t1 (x INT);
 | |
| INSERT INTO t1 VALUES (1), (2), (3);
 | |
| CREATE TEMPORARY TABLE tmp SELECT *, NULL FROM t1;
 | |
| drop table t1;
 | |
| create temporary table t1 (id int(10) not null unique);
 | |
| create temporary table t2 (id int(10) not null primary key, 
 | |
| val int(10) not null);
 | |
| insert into t1 values (1),(2),(4);
 | |
| insert into t2 values (1,1),(2,1),(3,1),(4,2);
 | |
| select one.id, two.val, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id order by one.id;
 | |
| id	val	elt(two.val,'one','two')
 | |
| 1	1	one
 | |
| 2	1	one
 | |
| 4	2	two
 | |
| drop table t1,t2;
 | |
| create temporary table t1 (a int not null);
 | |
| insert into t1 values (1),(1);
 | |
| alter table t1 add primary key (a);
 | |
| ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 | |
| drop table t1;
 | |
| CREATE TABLE t1 (
 | |
| d datetime default NULL
 | |
| ) ENGINE=MyISAM;
 | |
| INSERT INTO t1 VALUES ('2002-10-24 14:50:32'),('2002-10-24 14:50:33'),('2002-10-24 14:50:34'),('2002-10-24 14:50:34'),('2002-10-24 14:50:34'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:38'),('2002-10-24 14:50:38'),('2002-10-24 14:50:38'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:40'),('2002-10-24 14:50:40'),('2002-10-24 14:50:40');
 | |
| flush status;
 | |
| select * from t1 group by d;
 | |
| d
 | |
| 2002-10-24 14:50:32
 | |
| 2002-10-24 14:50:33
 | |
| 2002-10-24 14:50:34
 | |
| 2002-10-24 14:50:35
 | |
| 2002-10-24 14:50:36
 | |
| 2002-10-24 14:50:37
 | |
| 2002-10-24 14:50:38
 | |
| 2002-10-24 14:50:39
 | |
| 2002-10-24 14:50:40
 | |
| show status like "created_tmp%tables";
 | |
| Variable_name	Value
 | |
| Created_tmp_disk_tables	0
 | |
| Created_tmp_tables	1
 | |
| drop table t1;
 | |
| create temporary table v1 as select 'This is temp. table' A;
 | |
| create view v1 as select 'This is view' A;
 | |
| select * from v1;
 | |
| A
 | |
| This is temp. table
 | |
| show create table v1;
 | |
| Table	Create Table
 | |
| v1	CREATE TEMPORARY TABLE `v1` (
 | |
|   `A` varchar(19) NOT NULL DEFAULT ''
 | |
| ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 | |
| show create view v1;
 | |
| View	Create View
 | |
| v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select _latin1'This is view' AS `A`
 | |
| drop view v1;
 | |
| select * from v1;
 | |
| A
 | |
| This is temp. table
 | |
| create view v1 as select 'This is view again' A;
 | |
| select * from v1;
 | |
| A
 | |
| This is temp. table
 | |
| drop table v1;
 | |
| select * from v1;
 | |
| A
 | |
| This is view again
 | |
| drop view v1;
 | |
| create table t1 (a int, b int, index(a), index(b));
 | |
| create table t2 (c int auto_increment, d varchar(255), primary key (c));
 | |
| insert into t1 values (3,1),(3,2);
 | |
| insert into t2 values (NULL, 'foo'), (NULL, 'bar');
 | |
| select d, c from t1 left join t2 on b = c where a = 3 order by d;
 | |
| d	c
 | |
| bar	2
 | |
| foo	1
 | |
| drop table t1, t2;
 | |
| create temporary table t1 (a int);
 | |
| insert into t1 values (4711);
 | |
| select * from t1;
 | |
| a
 | |
| 4711
 | |
| truncate t1;
 | |
| insert into t1 values (42);
 | |
| select * from t1;
 | |
| a
 | |
| 42
 | |
| drop table t1;
 |