diff options
| author | gluh@gluh.mysql.r18.ru <> | 2005-03-16 13:37:08 +0300 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2005-03-16 13:37:08 +0300 |
| commit | 56058f916362cb6b24467e4a4cde81dc68fcf997 (patch) | |
| tree | 53c35bc5da8aa4d7f65a9ed51782bac3ef59cf0a /mysql-test | |
| parent | 9a52ffbfa4a676c1293fe7d8b80bece264018764 (diff) | |
| parent | 7a94c8c3e301af6f5a58ddbc6247c87338bae398 (diff) | |
| download | mariadb-git-56058f916362cb6b24467e4a4cde81dc68fcf997.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/information_schema.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/view.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/information_schema.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/view.test | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index e65924bfcbe..dc456e80e63 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -118,9 +118,9 @@ t2 t3 show table status; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t2 MyISAM 9 Fixed 0 0 0 21474836479 1024 0 NULL # # NULL latin1_swedish_ci NULL -t3 MyISAM 9 Fixed 0 0 0 21474836479 1024 0 NULL # # NULL latin1_swedish_ci NULL -v1 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view +t2 MyISAM 9 Fixed 0 0 0 # 1024 0 NULL # # NULL latin1_swedish_ci NULL +t3 MyISAM 9 Fixed 0 0 0 # 1024 0 NULL # # NULL latin1_swedish_ci NULL +v1 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view show full columns from t3 like "a%"; Field Type Collation Null Key Default Extra Privileges Comment a int(11) NULL YES MUL NULL select,insert,update,references diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index ece710a7a1b..75459bd960b 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -1115,8 +1115,8 @@ select * from v1; ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) show table status; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 MyISAM 9 Fixed 0 0 0 21474836479 1024 0 NULL # # NULL latin1_swedish_ci NULL -v1 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL View 'test.v1' references invalid table(s) or column(s) or function(s) +t1 MyISAM 9 Fixed 0 0 0 # 1024 0 NULL # # NULL latin1_swedish_ci NULL +v1 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL View 'test.v1' references invalid table(s) or column(s) or function(s) drop view v1; drop table t1; create view v1 as select 99999999999999999999999999999999999999999999999999999 as col1; diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index 4319fec258c..209755a0dcc 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -37,8 +37,7 @@ select * from information_schema.STATISTICS where TABLE_SCHEMA = "testtets"; show keys from t3 where Key_name = "a_data"; show tables like 't%'; ---replace_column 12 # 13 # ---replace_result "2147483647 " "21474836479 " +--replace_column 8 # 12 # 13 # show table status; show full columns from t3 like "a%"; show full columns from mysql.db like "Insert%"; diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index ff300235ea8..7a05ebb0204 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -1117,8 +1117,7 @@ create view v1 as select x1() from t1; drop function x1; -- error 1356 select * from v1; ---replace_column 12 # 13 # ---replace_result "2147483647 " "21474836479 " +--replace_column 8 # 12 # 13 # show table status; drop view v1; drop table t1; |