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
SHOW VARIABLES LIKE 'server_id';
Variable_name Value
server_id 1
2005-09-30 23:14:50 +02:00
SHOW INSTANCES;
2006-05-18 16:57:50 +02:00
instance_name state
2006-11-27 00:47:38 +01:00
mysqld1 XXXXX
2005-09-30 23:14:50 +02:00
mysqld2 offline
2006-05-18 16:57:50 +02:00
--------------------------------------------------------------------
-- 1.1.2.
--------------------------------------------------------------------
2005-09-30 23:14:50 +02:00
START INSTANCE mysqld2;
2006-06-19 12:13:34 +02:00
Success: the process has been started.
2005-09-30 23:14:50 +02:00
SHOW VARIABLES LIKE 'port';
Variable_name Value
2006-05-18 16:57:50 +02:00
port IM_MYSQLD2_PORT
--------------------------------------------------------------------
-- 1.1.3.
--------------------------------------------------------------------
2005-09-30 23:14:50 +02:00
STOP INSTANCE mysqld2;
2006-06-19 12:13:34 +02:00
Success: the process has been stopped.
2006-05-18 16:57:50 +02:00
--------------------------------------------------------------------
-- 1.1.4.
--------------------------------------------------------------------
2005-09-30 23:14:50 +02:00
START INSTANCE mysqld3;
2006-11-07 03:21:33 +01:00
ERROR HY000: Unknown instance name
2005-09-30 23:14:50 +02:00
START INSTANCE mysqld1;
ERROR HY000: The instance is already started
2006-05-18 16:57:50 +02:00
--------------------------------------------------------------------
-- 1.1.5.
--------------------------------------------------------------------
2005-09-30 23:14:50 +02:00
STOP INSTANCE mysqld3;
2006-11-07 03:21:33 +01:00
ERROR HY000: Unknown instance name
2006-05-18 16:57:50 +02:00
--------------------------------------------------------------------
-- 1.1.6.
--------------------------------------------------------------------
2005-09-30 23:14:50 +02:00
Killing the process...
2006-11-23 20:55:36 +01:00
Waiting...
2005-09-30 23:14:50 +02:00
Success: the process was restarted.
SHOW INSTANCES;
2006-05-18 16:57:50 +02:00
instance_name state
2005-09-30 23:14:50 +02:00
mysqld1 online
mysqld2 offline
2006-06-19 12:13:34 +02:00
--------------------------------------------------------------------
-- 1.1.7.
--------------------------------------------------------------------
2005-09-30 23:14:50 +02:00
START INSTANCE mysqld2;
2006-06-19 12:13:34 +02:00
Success: the process has been started.
2005-09-30 23:14:50 +02:00
Killing the process...
2006-11-23 20:55:36 +01:00
Waiting...
2005-09-30 23:14:50 +02:00
Success: the process was killed.
2006-05-18 16:57:50 +02:00
--------------------------------------------------------------------
-- 1.1.8.
--------------------------------------------------------------------
2006-02-10 00:15:55 +01:00
SHOW INSTANCE STATUS;
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
2006-05-18 16:57:50 +02:00
--------------------------------------------------------------------
-- BUG#12813
--------------------------------------------------------------------
2006-02-14 01:09:17 +01:00
START INSTANCE mysqld1,mysqld2,mysqld3;
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
STOP INSTANCE mysqld1,mysqld2,mysqld3;
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
2006-07-12 21:30:22 +02:00
STOP INSTANCE mysqld2;
ERROR HY000: Cannot stop instance. Perhaps the instance is not started, or was started manually, so IM cannot find the pidfile.
End of 5.0 tests
