mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
a62e9a83c0
Make mysqltest to use --ps-protocol more use prepared statements for everything that server supports with the exception of CALL (for now). Fix discovered test failures and bugs. tests: * PROCESSLIST shows Execute state, not Query * SHOW STATUS increments status variables more than in text protocol * multi-statements should be avoided (see tests with a wrong delimiter) * performance_schema events have different names in --ps-protocol * --enable_prepare_warnings mysqltest.cc: * make sure run_query_stmt() doesn't crash if there's no active connection (in wait_until_connected_again.inc) * prepare all statements that server supports protocol.h * Protocol_discard::send_result_set_metadata() should not send anything to the client. sql_acl.cc: * extract the functionality of getting the user for SHOW GRANTS from check_show_access(), so that mysql_test_show_grants() could generate the correct column names in the prepare step sql_class.cc: * result->prepare() can fail, don't ignore its return value * use correct number of decimals for EXPLAIN columns sql_parse.cc: * discard profiling for SHOW PROFILE. In text protocol it's done in prepare_schema_table(), but in --ps it is called on prepare only, so nothing was discarding profiling during execute. * move the permission checking code for SHOW CREATE VIEW to mysqld_show_create_get_fields(), so that it would be called during prepare step too. * only set sel_result when it was created here and needs to be destroyed in the same block. Avoid destroying lex->result. * use the correct number of tables in check_show_access(). Saying "as many as possible" doesn't work when first_not_own_table isn't set yet. sql_prepare.cc: * use correct user name for SHOW GRANTS columns * don't ignore verbose flag for SHOW SLAVE STATUS * support preparing REVOKE ALL and ROLLBACK TO SAVEPOINT * don't ignore errors from thd->prepare_explain_fields() * use select_send result for sending ANALYZE and EXPLAIN, but don't overwrite lex->result, because it might be needed to issue execute-time errors (select_dumpvar - too many rows) sql_show.cc: * check grants for SHOW CREATE VIEW here, not in mysql_execute_command sql_view.cc: * use the correct function to check privileges. Old code was doing check_access() for thd->security_ctx, which is invoker's sctx, not definer's sctx. Hide various view related errors from the invoker. sql_yacc.yy: * initialize lex->select_lex for LOAD, otherwise it'll contain garbage data that happen to fail tests with views in --ps (but not otherwise).
119 lines
3.8 KiB
Text
119 lines
3.8 KiB
Text
#
|
|
# Testing of user status (the userstat variable).
|
|
# Note that this test requires a fresh restart to not have problems with the
|
|
# old status values
|
|
|
|
-- source include/have_innodb.inc
|
|
-- source include/have_log_bin.inc
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
select variable_value from information_schema.global_status where variable_name="handler_read_key" into @global_read_key;
|
|
show columns from information_schema.client_statistics;
|
|
show columns from information_schema.user_statistics;
|
|
show columns from information_schema.index_statistics;
|
|
show columns from information_schema.table_statistics;
|
|
|
|
# Disable logging to get right number of writes into the tables.
|
|
set @save_general_log=@@global.general_log;
|
|
set @@global.general_log=0;
|
|
set @@global.userstat=1;
|
|
flush status;
|
|
|
|
create table t1 (a int, primary key (a), b int default 0) engine=innodb;
|
|
insert into t1 (a) values (1),(2),(3),(4);
|
|
update t1 set b=1;
|
|
update t1 set b=5 where a=2;
|
|
delete from t1 where a=3;
|
|
|
|
/* Empty query */
|
|
select * from t1 where a=999;
|
|
|
|
drop table t1;
|
|
|
|
# test SSL connections
|
|
--connect (ssl_con,localhost,root,,,,,SSL)
|
|
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
|
|
--connection default
|
|
|
|
#
|
|
# Test the commit and rollback are counted
|
|
#
|
|
|
|
create table t1 (a int, primary key (a), b int default 0) engine=innodb;
|
|
begin;
|
|
insert into t1 values(1,1);
|
|
commit;
|
|
begin;
|
|
insert into t1 values(2,2);
|
|
commit;
|
|
begin;
|
|
insert into t1 values(3,3);
|
|
rollback;
|
|
drop table t1;
|
|
|
|
select sleep(1);
|
|
|
|
show status like "rows%";
|
|
show status like "ha%";
|
|
select variable_value - @global_read_key as "handler_read_key" from information_schema.global_status where variable_name="handler_read_key";
|
|
|
|
--disconnect ssl_con
|
|
|
|
# Ensure that the following commands doesn't change statistics
|
|
|
|
set @@global.userstat=0;
|
|
|
|
#
|
|
# Check that we got right statistics
|
|
#
|
|
select * from information_schema.index_statistics;
|
|
select * from information_schema.table_statistics;
|
|
show table_statistics;
|
|
show index_statistics;
|
|
--query_vertical select TOTAL_CONNECTIONS, TOTAL_SSL_CONNECTIONS, CONCURRENT_CONNECTIONS, ROWS_READ, ROWS_SENT, ROWS_DELETED, ROWS_INSERTED, ROWS_UPDATED, SELECT_COMMANDS, UPDATE_COMMANDS, COMMIT_TRANSACTIONS, ROLLBACK_TRANSACTIONS, DENIED_CONNECTIONS, LOST_CONNECTIONS, ACCESS_DENIED, EMPTY_QUERIES from information_schema.client_statistics;
|
|
--query_vertical select TOTAL_CONNECTIONS, TOTAL_SSL_CONNECTIONS, CONCURRENT_CONNECTIONS, ROWS_READ, ROWS_SENT, ROWS_DELETED, ROWS_INSERTED, ROWS_UPDATED, SELECT_COMMANDS, UPDATE_COMMANDS, COMMIT_TRANSACTIONS, ROLLBACK_TRANSACTIONS, DENIED_CONNECTIONS, LOST_CONNECTIONS, ACCESS_DENIED, EMPTY_QUERIES from information_schema.user_statistics;
|
|
# different values in --ps-protocol
|
|
select OTHER_COMMANDS IN (7,8) from information_schema.client_statistics;
|
|
select OTHER_COMMANDS IN (7,8) from information_schema.user_statistics;
|
|
flush table_statistics;
|
|
flush index_statistics;
|
|
select * from information_schema.index_statistics;
|
|
select * from information_schema.table_statistics;
|
|
show status like "%generic%";
|
|
|
|
#
|
|
# Test that some variables are not 0
|
|
#
|
|
|
|
select connected_time <> 0, busy_time <> 0, bytes_received <> 0,
|
|
bytes_sent <> 0, binlog_bytes_written <> 0
|
|
from information_schema.user_statistics;
|
|
select connected_time <> 0, busy_time <> 0, bytes_received <> 0,
|
|
bytes_sent <> 0, binlog_bytes_written <> 0
|
|
from information_schema.client_statistics;
|
|
|
|
#
|
|
# Test of in transaction
|
|
#
|
|
|
|
create table t1 (a int) engine=innodb;
|
|
select @@in_transaction;
|
|
begin;
|
|
select @@in_transaction;
|
|
insert into t1 values (1);
|
|
select @@in_transaction;
|
|
commit;
|
|
select @@in_transaction;
|
|
set @@autocommit=0;
|
|
select @@in_transaction;
|
|
insert into t1 values (2);
|
|
select @@in_transaction;
|
|
set @@autocommit=1;
|
|
select @@in_transaction;
|
|
drop table t1;
|
|
|
|
# Cleanup
|
|
set @@global.general_log=@save_general_log;
|