diff options
| author | georg@lmy002.wdf.sap.corp <> | 2005-08-25 07:02:37 +0200 |
|---|---|---|
| committer | georg@lmy002.wdf.sap.corp <> | 2005-08-25 07:02:37 +0200 |
| commit | adc603a93009b759a01f21b77bc2205e10bb6ad7 (patch) | |
| tree | 32c5042ae3cdbfd18b184bf3322c7748c9965aa6 /mysql-test/r | |
| parent | 27b6d59db29e1ac5a58536a86088e8de752fde12 (diff) | |
| parent | 254db48603d33df86f2e2e318bd0c533748986c3 (diff) | |
| download | mariadb-git-adc603a93009b759a01f21b77bc2205e10bb6ad7.tar.gz | |
Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/information_schema.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/view.result | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 679eb96e4ed..91a99e4ea55 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -152,7 +152,7 @@ Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length I t2 MyISAM 10 Fixed 0 0 0 # 1024 0 NULL # # NULL latin1_swedish_ci NULL t3 MyISAM 10 Fixed 0 0 0 # 1024 0 NULL # # NULL latin1_swedish_ci NULL t5 MyISAM 10 Fixed 1 7 7 # 2048 0 11 # # NULL latin1_swedish_ci NULL -v1 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view +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 f56c6558e4f..6467c080a17 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -150,12 +150,12 @@ v6 VIEW 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 10 Fixed 5 9 45 # 1024 0 NULL # # NULL latin1_swedish_ci NULL -v1 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view -v2 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view -v3 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view -v4 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view -v5 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view -v6 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view +v1 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL VIEW +v2 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL VIEW +v3 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL VIEW +v4 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL VIEW +v5 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL VIEW +v6 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL VIEW drop view v1,v2,v3,v4,v5,v6; create view v1 (c,d,e,f) as select a,b, a in (select a+2 from t1), a = all (select a from t1) from t1; |