mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
7fd0ad21a7
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint CMakeLists.txt: Auto merged configure.in: Auto merged libmysql/CMakeLists.txt: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/information_schema_db.result: Auto merged mysql-test/t/information_schema.test: Auto merged sql/CMakeLists.txt: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/structs.h: Auto merged sql/table.h: Auto merged storage/archive/ha_archive.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged support-files/mysql.spec.sh: Auto merged client/mysqlcheck.c: Manual merge. mysql-test/r/information_schema.result: Manual merge. mysql-test/r/mysqlcheck.result: Manual merge. mysql-test/t/mysqlcheck.test: Manual merge. sql/slave.cc: Manual merge. sql/sql_base.cc: Manual merge. sql/sql_delete.cc: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_update.cc: Manual merge.
87 lines
2.6 KiB
Text
87 lines
2.6 KiB
Text
|
|
# Embedded server doesn't support external clients
|
|
--source include/not_embedded.inc
|
|
|
|
# check that CSV engine was compiled in, as the result of the test
|
|
# depends on the presence of the log tables (which are CSV-based).
|
|
--source include/have_csv.inc
|
|
|
|
#
|
|
# Clean up after previous tests
|
|
#
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1, `t``1`, `t 1`;
|
|
drop view if exists v1;
|
|
drop database if exists client_test_db;
|
|
--enable_warnings
|
|
|
|
#
|
|
# Bug #13783 mysqlcheck tries to optimize and analyze information_schema
|
|
#
|
|
--replace_result 'Table is already up to date' OK
|
|
--exec $MYSQL_CHECK --all-databases --analyze --optimize
|
|
--replace_result 'Table is already up to date' OK
|
|
--exec $MYSQL_CHECK --analyze --optimize --databases test information_schema mysql
|
|
--exec $MYSQL_CHECK --analyze --optimize information_schema schemata
|
|
|
|
#
|
|
# Bug #16502: mysqlcheck tries to check views
|
|
#
|
|
create table t1 (a int);
|
|
create view v1 as select * from t1;
|
|
--replace_result 'Table is already up to date' OK
|
|
--exec $MYSQL_CHECK --analyze --optimize --databases test
|
|
--replace_result 'Table is already up to date' OK
|
|
--exec $MYSQL_CHECK --all-in-1 --analyze --optimize --databases test
|
|
drop view v1;
|
|
drop table t1;
|
|
|
|
#
|
|
# Bug #30654: mysqlcheck fails during upgrade of tables whose names include backticks
|
|
#
|
|
create table `t``1`(a int);
|
|
create table `t 1`(a int);
|
|
--replace_result 'Table is already up to date' OK
|
|
--exec $MYSQL_CHECK --databases test
|
|
drop table `t``1`, `t 1`;
|
|
|
|
#
|
|
# Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed
|
|
#
|
|
create database d_bug25347;
|
|
use d_bug25347;
|
|
create table t_bug25347 (a int);
|
|
create view v_bug25347 as select * from t_bug25347;
|
|
insert into t_bug25347 values (1),(2),(3);
|
|
flush tables;
|
|
--echo removing and creating
|
|
--remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
|
|
--write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI EOF
|
|
EOF
|
|
--exec $MYSQL_CHECK --repair --databases d_bug25347
|
|
--error 130
|
|
insert into t_bug25347 values (4),(5),(6);
|
|
--exec $MYSQL_CHECK --repair --use-frm --databases d_bug25347
|
|
insert into t_bug25347 values (7),(8),(9);
|
|
select * from t_bug25347;
|
|
select * from v_bug25347;
|
|
drop view v_bug25347;
|
|
drop table t_bug25347;
|
|
drop database d_bug25347;
|
|
use test;
|
|
|
|
--echo End of 5.0 tests
|
|
|
|
#
|
|
# Bug #30679: 5.1 name encoding not performed for views during upgrade
|
|
#
|
|
create table t1(a int);
|
|
create view v1 as select * from t1;
|
|
show tables;
|
|
--copy_file $MYSQLTEST_VARDIR/master-data/test/v1.frm $MYSQLTEST_VARDIR/master-data/test/v-1.frm
|
|
show tables;
|
|
--exec $MYSQL_CHECK --check-upgrade --fix-table-names --databases test
|
|
show tables;
|
|
drop view v1, `v-1`;
|
|
drop table t1;
|