mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +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).
47 lines
1.3 KiB
Text
47 lines
1.3 KiB
Text
--source include/have_innodb.inc
|
|
--source include/not_embedded.inc
|
|
|
|
#
|
|
# MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADD
|
|
#
|
|
|
|
call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MySQL.*");
|
|
call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB, which is different from the number of indexes .* defined in the MySQL.*");
|
|
|
|
create table t1 (pk int, i int, key(i)) engine=InnoDB;
|
|
insert into t1 values (1,1),(2,2);
|
|
|
|
--let $datadir= `select @@datadir`
|
|
|
|
flush tables;
|
|
|
|
--echo # Save the .frm file without the PK
|
|
|
|
--copy_file $datadir/test/t1.frm $MYSQLTEST_VARDIR/tmp/t1.frm
|
|
|
|
alter table t1 add primary key (pk);
|
|
|
|
--echo # Stop the server, replace the frm with the old one and restart the server
|
|
|
|
--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
|
--shutdown_server 10
|
|
--source include/wait_until_disconnected.inc
|
|
|
|
--remove_file $datadir/test/t1.frm
|
|
--copy_file $MYSQLTEST_VARDIR/tmp/t1.frm $datadir/test/t1.frm
|
|
|
|
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
|
--enable_reconnect
|
|
--source include/wait_until_connected_again.inc
|
|
|
|
--enable_prepare_warnings
|
|
show create table t1;
|
|
select * from t1;
|
|
alter table t1 add j int;
|
|
show warnings;
|
|
show create table t1;
|
|
alter table t1 add primary key (pk);
|
|
show warnings;
|
|
show create table t1;
|
|
# Cleanup
|
|
drop table t1;
|