summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2005-03-17 13:25:19 +0300
committerunknown <gluh@gluh.mysql.r18.ru>2005-03-17 13:25:19 +0300
commit621abfacfe316df9ce06c9d046ec11f23e543ea7 (patch)
tree6b9ad616828b3ba113435ac4fc4af2f9602bfa80 /mysql-test/r
parent5c1b91f1ee1248f91fb8c886967bb6c510ee854c (diff)
parent4079a85af4704c3e4db14a912f0da176d4b77d76 (diff)
downloadmariadb-git-621abfacfe316df9ce06c9d046ec11f23e543ea7.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/r')
-rw-r--r--mysql-test/r/information_schema.result6
-rw-r--r--mysql-test/r/view.result4
2 files changed, 5 insertions, 5 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;