mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
21e75cb081
client/mysqldump.c: A post-merge fix - 'sock' was renamed to 'mysql' mysql-test/r/events_bugs.result: A post merge fix: now we strip rear comments from the query before it gets into the log. mysql-test/r/func_group.result: A post merge fix: default clause is now printed uppercase. mysql-test/r/im_life_cycle.result: Fix my mistake in manual resolve. mysql-test/r/mysqlcheck.result: use test; - after we drop client_test_db there is no current database. This cleanup is present in 5.1 only, but the test that was added in 5.0 assumes there is a current database, test. mysql-test/r/mysqldump.result: Ignore results of execution of mysqldump: we can't rely on MASTER_LOG_POS in test results, it's different for statement and row level logging. mysql-test/r/mysqlshow.result: A post-merge fix: information schema contains a few more tables in 5.1 mysql-test/r/mysqltest.result: A post merge fix: add 5.1 test end separator. mysql-test/r/ndb_basic.result: A post-merge fix: add test end separators. mysql-test/r/rpl_switch_stm_row_mixed.result: A post merge fix: length of varbinary column is now 3 times less. Assuming a side effect of some other change. Length of any field is not relevant in this test. mysql-test/r/rpl_view.result: Add an end of test marker. mysql-test/r/show_check.result: Remove duplicate results. Add results from a merged test case. mysql-test/r/sp-error.result: Add test end separators. mysql-test/r/sp-security.result: Post-merge fix: use test after the current database is dropped. mysql-test/r/sp.result: Remove a duplicate result (bad merge that left a copy of the test case for Bug#19862 in the test suite). mysql-test/r/strict.result: An after-merge fix for a new test case: in 5.1 we issue a more accurate error message: "Incorrect value" instead of "Truncated value". I reason it so that in case of an error nothing is truncated, really. Also found similar changes in other test cases. mysql-test/r/type_datetime.result: Fix the text of an error. mysql-test/r/union.result: A post-merge fix: CHARACTER SET is now uppercase. mysql-test/t/mysqlcheck.test: A post-merge fix: use test, after current database is dropped, there is no current database. mysql-test/t/mysqldump.test: Disable result log: it's dependent on binlog position. mysql-test/t/sp-security.test: use test sql/item_sum.cc: Adjust the call to the constructor after the merge. sql/sp_head.cc: Add a missing DBUG_VOID_RETURN, move security checks out of execute_trigger to Table_triggers_list: in 5.1 we check for TRIGGER privilege, not SUPER privilege to execute triggers, so these checks lack table context inside execute_trigger and have to be performed when we have table object on hand. sql/sql_db.cc: A post-merge fix: adjust load_db_opt_by_name and check_db_dir_existence (new functions added in 5.0) to be tablename-to-filename encoding friendly. sql/sql_lex.cc: A post-merge fix: make skip_rear_comments operate on const uchar *s. sql/sql_lex.h: A post-merge fix. sql/sql_show.cc: A post-merge fix: fix a bad merge, rename orig_sql_command -> sql_command. sql/sql_trigger.cc: A post-merge fix: move security checks to process_triggers from execute_trigger. sql/sql_view.cc: Adjust to the new signature of skip_rear_comments. sql/sql_yacc.yy: Adjust to the new signature of init_strings.
36 lines
1.1 KiB
Text
36 lines
1.1 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
|
|
|
|
--disable_warnings
|
|
drop database if exists client_test_db;
|
|
--enable_warnings
|
|
|
|
DROP SCHEMA test;
|
|
CREATE SCHEMA test;
|
|
use test;
|
|
#
|
|
# 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;
|
|
|
|
--echo End of 5.0 tests
|