2006-06-05 05:16:08 +02:00
|
|
|
drop database if exists client_test_db;
|
2006-02-24 22:20:51 +01:00
|
|
|
DROP SCHEMA test;
|
|
|
|
|
CREATE SCHEMA test;
|
Manual merge 5.0->5.1. Post-merge fixes.
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.
2006-08-14 11:27:11 +02:00
|
|
|
use test;
|
2006-03-01 13:31:21 +01:00
|
|
|
cluster.binlog_index OK
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.columns_priv OK
|
|
|
|
|
mysql.db OK
|
2006-01-11 12:49:56 +01:00
|
|
|
mysql.event OK
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.func OK
|
2006-01-19 03:56:06 +01:00
|
|
|
mysql.general_log
|
|
|
|
|
note : The storage engine for the table doesn't support optimize
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.help_category OK
|
|
|
|
|
mysql.help_keyword OK
|
|
|
|
|
mysql.help_relation OK
|
|
|
|
|
mysql.help_topic OK
|
|
|
|
|
mysql.host OK
|
2005-11-06 13:13:06 +01:00
|
|
|
mysql.plugin OK
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.proc OK
|
|
|
|
|
mysql.procs_priv OK
|
2006-01-19 03:56:06 +01:00
|
|
|
mysql.slow_log
|
|
|
|
|
note : The storage engine for the table doesn't support optimize
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.tables_priv OK
|
|
|
|
|
mysql.time_zone OK
|
|
|
|
|
mysql.time_zone_leap_second OK
|
|
|
|
|
mysql.time_zone_name OK
|
|
|
|
|
mysql.time_zone_transition OK
|
|
|
|
|
mysql.time_zone_transition_type OK
|
|
|
|
|
mysql.user OK
|
|
|
|
|
mysql.columns_priv OK
|
|
|
|
|
mysql.db OK
|
2006-01-11 12:49:56 +01:00
|
|
|
mysql.event OK
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.func OK
|
2006-01-19 03:56:06 +01:00
|
|
|
mysql.general_log
|
|
|
|
|
note : The storage engine for the table doesn't support optimize
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.help_category OK
|
|
|
|
|
mysql.help_keyword OK
|
|
|
|
|
mysql.help_relation OK
|
|
|
|
|
mysql.help_topic OK
|
|
|
|
|
mysql.host OK
|
2005-11-06 13:13:06 +01:00
|
|
|
mysql.plugin OK
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.proc OK
|
|
|
|
|
mysql.procs_priv OK
|
2006-01-19 03:56:06 +01:00
|
|
|
mysql.slow_log
|
|
|
|
|
note : The storage engine for the table doesn't support optimize
|
2005-10-18 11:25:03 +02:00
|
|
|
mysql.tables_priv OK
|
|
|
|
|
mysql.time_zone OK
|
|
|
|
|
mysql.time_zone_leap_second OK
|
|
|
|
|
mysql.time_zone_name OK
|
|
|
|
|
mysql.time_zone_transition OK
|
|
|
|
|
mysql.time_zone_transition_type OK
|
|
|
|
|
mysql.user OK
|
2006-07-24 22:31:20 +02:00
|
|
|
create table t1 (a int);
|
|
|
|
|
create view v1 as select * from t1;
|
|
|
|
|
test.t1 OK
|
|
|
|
|
test.t1 OK
|
|
|
|
|
drop view v1;
|
|
|
|
|
drop table t1;
|
|
|
|
|
End of 5.0 tests
|