2006-01-05 23:47:49 +01:00
|
|
|
DROP TABLE IF EXISTS t1,t2,test1,test2;
|
2005-03-15 19:46:43 +01:00
|
|
|
CREATE TABLE t1 (a int);
|
|
|
|
|
INSERT INTO t1 VALUES (1),(2),(3);
|
|
|
|
|
CREATE TABLE t2 (a int, b int);
|
|
|
|
|
show tables;
|
|
|
|
|
Tables_in_test
|
|
|
|
|
t1
|
|
|
|
|
t2
|
|
|
|
|
select "--------------------" as "";
|
|
|
|
|
|
|
|
|
|
--------------------
|
|
|
|
|
Database: test
|
|
|
|
|
+--------+
|
|
|
|
|
| Tables |
|
|
|
|
|
+--------+
|
|
|
|
|
| t1 |
|
|
|
|
|
| t2 |
|
|
|
|
|
+--------+
|
|
|
|
|
select "---- -v ------------" as "";
|
|
|
|
|
|
|
|
|
|
---- -v ------------
|
|
|
|
|
Database: test
|
|
|
|
|
+--------+----------+
|
|
|
|
|
| Tables | Columns |
|
|
|
|
|
+--------+----------+
|
|
|
|
|
| t1 | 1 |
|
|
|
|
|
| t2 | 2 |
|
|
|
|
|
+--------+----------+
|
|
|
|
|
2 rows in set.
|
|
|
|
|
|
|
|
|
|
select "---- -v -v ---------" as "";
|
|
|
|
|
|
|
|
|
|
---- -v -v ---------
|
|
|
|
|
Database: test
|
|
|
|
|
+--------+----------+------------+
|
|
|
|
|
| Tables | Columns | Total Rows |
|
|
|
|
|
+--------+----------+------------+
|
|
|
|
|
| t1 | 1 | 3 |
|
|
|
|
|
| t2 | 2 | 0 |
|
|
|
|
|
+--------+----------+------------+
|
|
|
|
|
2 rows in set.
|
|
|
|
|
|
|
|
|
|
select "----- -t -----------" as "";
|
|
|
|
|
|
|
|
|
|
----- -t -----------
|
|
|
|
|
Database: test
|
|
|
|
|
+--------+------------+
|
|
|
|
|
| Tables | table_type |
|
|
|
|
|
+--------+------------+
|
|
|
|
|
| t1 | BASE TABLE |
|
|
|
|
|
| t2 | BASE TABLE |
|
|
|
|
|
+--------+------------+
|
|
|
|
|
select "---- -v -t ---------" as "";
|
|
|
|
|
|
|
|
|
|
---- -v -t ---------
|
|
|
|
|
Database: test
|
|
|
|
|
+--------+------------+----------+
|
|
|
|
|
| Tables | table_type | Columns |
|
|
|
|
|
+--------+------------+----------+
|
|
|
|
|
| t1 | BASE TABLE | 1 |
|
|
|
|
|
| t2 | BASE TABLE | 2 |
|
|
|
|
|
+--------+------------+----------+
|
|
|
|
|
2 rows in set.
|
|
|
|
|
|
|
|
|
|
select "---- -v -v -t ------" as "";
|
|
|
|
|
|
|
|
|
|
---- -v -v -t ------
|
|
|
|
|
Database: test
|
|
|
|
|
+--------+------------+----------+------------+
|
|
|
|
|
| Tables | table_type | Columns | Total Rows |
|
|
|
|
|
+--------+------------+----------+------------+
|
|
|
|
|
| t1 | BASE TABLE | 1 | 3 |
|
|
|
|
|
| t2 | BASE TABLE | 2 | 0 |
|
|
|
|
|
+--------+------------+----------+------------+
|
|
|
|
|
2 rows in set.
|
|
|
|
|
|
|
|
|
|
DROP TABLE t1, t2;
|
2006-07-22 05:29:25 +02:00
|
|
|
Database: information_schema
|
|
|
|
|
+---------------------------------------+
|
|
|
|
|
| Tables |
|
|
|
|
|
+---------------------------------------+
|
|
|
|
|
| CHARACTER_SETS |
|
|
|
|
|
| COLLATIONS |
|
|
|
|
|
| COLLATION_CHARACTER_SET_APPLICABILITY |
|
|
|
|
|
| COLUMNS |
|
|
|
|
|
| COLUMN_PRIVILEGES |
|
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
|
|
|
| ENGINES |
|
|
|
|
|
| EVENTS |
|
|
|
|
|
| FILES |
|
2006-09-14 03:35:50 +02:00
|
|
|
| GLOBAL_STATUS |
|
|
|
|
|
| GLOBAL_VARIABLES |
|
2006-07-22 05:29:25 +02:00
|
|
|
| KEY_COLUMN_USAGE |
|
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
|
|
|
| PARTITIONS |
|
|
|
|
|
| PLUGINS |
|
|
|
|
|
| PROCESSLIST |
|
|
|
|
|
| REFERENTIAL_CONSTRAINTS |
|
2006-07-22 05:29:25 +02:00
|
|
|
| ROUTINES |
|
|
|
|
|
| SCHEMATA |
|
|
|
|
|
| SCHEMA_PRIVILEGES |
|
2006-09-14 03:35:50 +02:00
|
|
|
| SESSION_STATUS |
|
|
|
|
|
| SESSION_VARIABLES |
|
2006-07-22 05:29:25 +02:00
|
|
|
| STATISTICS |
|
|
|
|
|
| TABLES |
|
|
|
|
|
| TABLE_CONSTRAINTS |
|
|
|
|
|
| TABLE_PRIVILEGES |
|
|
|
|
|
| TRIGGERS |
|
|
|
|
|
| USER_PRIVILEGES |
|
|
|
|
|
| VIEWS |
|
|
|
|
|
+---------------------------------------+
|
|
|
|
|
Database: INFORMATION_SCHEMA
|
|
|
|
|
+---------------------------------------+
|
|
|
|
|
| Tables |
|
|
|
|
|
+---------------------------------------+
|
|
|
|
|
| CHARACTER_SETS |
|
|
|
|
|
| COLLATIONS |
|
|
|
|
|
| COLLATION_CHARACTER_SET_APPLICABILITY |
|
|
|
|
|
| COLUMNS |
|
|
|
|
|
| COLUMN_PRIVILEGES |
|
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
|
|
|
| ENGINES |
|
|
|
|
|
| EVENTS |
|
|
|
|
|
| FILES |
|
2006-09-14 03:35:50 +02:00
|
|
|
| GLOBAL_STATUS |
|
|
|
|
|
| GLOBAL_VARIABLES |
|
2006-07-22 05:29:25 +02:00
|
|
|
| KEY_COLUMN_USAGE |
|
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
|
|
|
| PARTITIONS |
|
|
|
|
|
| PLUGINS |
|
|
|
|
|
| PROCESSLIST |
|
|
|
|
|
| REFERENTIAL_CONSTRAINTS |
|
2006-07-22 05:29:25 +02:00
|
|
|
| ROUTINES |
|
|
|
|
|
| SCHEMATA |
|
|
|
|
|
| SCHEMA_PRIVILEGES |
|
2006-09-14 03:35:50 +02:00
|
|
|
| SESSION_STATUS |
|
|
|
|
|
| SESSION_VARIABLES |
|
2006-07-22 05:29:25 +02:00
|
|
|
| STATISTICS |
|
|
|
|
|
| TABLES |
|
|
|
|
|
| TABLE_CONSTRAINTS |
|
|
|
|
|
| TABLE_PRIVILEGES |
|
|
|
|
|
| TRIGGERS |
|
|
|
|
|
| USER_PRIVILEGES |
|
|
|
|
|
| VIEWS |
|
|
|
|
|
+---------------------------------------+
|
|
|
|
|
Wildcard: inf_rmation_schema
|
|
|
|
|
+--------------------+
|
|
|
|
|
| Databases |
|
|
|
|
|
+--------------------+
|
|
|
|
|
| information_schema |
|
|
|
|
|
+--------------------+
|
|
|
|
|
End of 5.0 tests
|