summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/alt000001.result5
-rw-r--r--mysql-test/r/alter_table.result27
-rw-r--r--mysql-test/r/analyse.result6
-rw-r--r--mysql-test/r/auto_increment.result57
-rw-r--r--mysql-test/r/bdb.result377
-rw-r--r--mysql-test/r/bigint.result13
-rw-r--r--mysql-test/r/binary.result33
-rw-r--r--mysql-test/r/case.result34
-rw-r--r--mysql-test/r/comments.result15
-rw-r--r--mysql-test/r/compare.result6
-rw-r--r--mysql-test/r/count_distinct.result9
-rw-r--r--mysql-test/r/create.result10
-rw-r--r--mysql-test/r/delayed.result5
-rw-r--r--mysql-test/r/delete.result0
-rw-r--r--mysql-test/r/distinct.result155
-rw-r--r--mysql-test/r/empty_table.result4
-rw-r--r--mysql-test/r/explain.result15
-rw-r--r--mysql-test/r/fulltext.result8
-rw-r--r--mysql-test/r/func_crypt.result (renamed from mysql-test/r/crypt.result)0
-rw-r--r--mysql-test/r/func_date_add.result12
-rw-r--r--mysql-test/r/func_equal.result (renamed from mysql-test/r/equal.result)0
-rw-r--r--mysql-test/r/func_group.result86
-rw-r--r--mysql-test/r/func_in.result14
-rw-r--r--mysql-test/r/func_like.result7
-rw-r--r--mysql-test/r/func_math.result22
-rw-r--r--mysql-test/r/func_misc.result8
-rw-r--r--mysql-test/r/func_op.result6
-rw-r--r--mysql-test/r/func_regexp.result15
-rw-r--r--mysql-test/r/func_set.result18
-rw-r--r--mysql-test/r/func_str.result (renamed from mysql-test/r/strfunc.result)37
-rw-r--r--mysql-test/r/func_system.result4
-rw-r--r--mysql-test/r/func_test.result36
-rw-r--r--mysql-test/r/func_time.result186
-rw-r--r--mysql-test/r/group_by.result32
-rw-r--r--mysql-test/r/have_raid.require2
-rw-r--r--mysql-test/r/heap.result80
-rw-r--r--mysql-test/r/ins000001.result2
-rw-r--r--mysql-test/r/insert.result6
-rw-r--r--mysql-test/r/insert_select.result13
-rw-r--r--mysql-test/r/join.result9
-rw-r--r--mysql-test/r/join_outer.result315
-rw-r--r--mysql-test/r/key.result12
-rw-r--r--mysql-test/r/key_diff.result39
-rw-r--r--mysql-test/r/key_primary.result9
-rw-r--r--mysql-test/r/keywords.result4
-rw-r--r--mysql-test/r/limit.result22
-rw-r--r--mysql-test/r/merge.result109
-rw-r--r--mysql-test/r/mrg000001.dummy.result1
-rw-r--r--mysql-test/r/mrg000001.result5
-rw-r--r--mysql-test/r/mrg000002.result1
-rw-r--r--mysql-test/r/null.result25
-rw-r--r--mysql-test/r/null_key.result94
-rw-r--r--mysql-test/r/odbc.result7
-rw-r--r--mysql-test/r/order_by.result110
-rw-r--r--mysql-test/r/raid.result8
-rw-r--r--mysql-test/r/range.result57
-rw-r--r--mysql-test/r/rename.result14
-rw-r--r--mysql-test/r/rollback.result3
-rw-r--r--mysql-test/r/sel000004.result2
-rw-r--r--mysql-test/r/sel000005.result2
-rw-r--r--mysql-test/r/sel000006.result2
-rw-r--r--mysql-test/r/sel000007.result2
-rw-r--r--mysql-test/r/sel000008.result2
-rw-r--r--mysql-test/r/sel000009.result2
-rw-r--r--mysql-test/r/sel000010.result2
-rw-r--r--mysql-test/r/sel000011.result2
-rw-r--r--mysql-test/r/sel000012.result2
-rw-r--r--mysql-test/r/sel000013.result2
-rw-r--r--mysql-test/r/sel000014.result2
-rw-r--r--mysql-test/r/sel000015.result2
-rw-r--r--mysql-test/r/sel000016.result2
-rw-r--r--mysql-test/r/sel000017.result2
-rw-r--r--mysql-test/r/sel000018.result2
-rw-r--r--mysql-test/r/sel000019.result2
-rw-r--r--mysql-test/r/sel000020.result2
-rw-r--r--mysql-test/r/sel000021.result2
-rw-r--r--mysql-test/r/sel000022.result2
-rw-r--r--mysql-test/r/sel000023.result2
-rw-r--r--mysql-test/r/sel000024.result2
-rw-r--r--mysql-test/r/sel000025.result2
-rw-r--r--mysql-test/r/sel000026.result2
-rw-r--r--mysql-test/r/sel000027.result2
-rw-r--r--mysql-test/r/sel000028.result2
-rw-r--r--mysql-test/r/sel000029.result2
-rw-r--r--mysql-test/r/sel000030.result2
-rw-r--r--mysql-test/r/select_safe.result10
-rw-r--r--mysql-test/r/show_check.result36
-rw-r--r--mysql-test/r/tablelock.result12
-rw-r--r--mysql-test/r/temp_table.result30
-rw-r--r--mysql-test/r/truncate.result4
-rw-r--r--mysql-test/r/type_blob.result289
-rw-r--r--mysql-test/r/type_date.result20
-rw-r--r--mysql-test/r/type_datetime.result33
-rw-r--r--mysql-test/r/type_enum.result1616
-rw-r--r--mysql-test/r/type_float.result66
-rw-r--r--mysql-test/r/type_ranges.result159
-rw-r--r--mysql-test/r/type_time.result68
-rw-r--r--mysql-test/r/type_timestamp.result2
-rw-r--r--mysql-test/r/type_uint.result3
-rw-r--r--mysql-test/r/type_year.result21
-rw-r--r--mysql-test/r/update.result2
-rw-r--r--mysql-test/r/varbinary.result6
-rw-r--r--mysql-test/r/variables.result12
103 files changed, 4585 insertions, 67 deletions
diff --git a/mysql-test/r/alt000001.result b/mysql-test/r/alt000001.result
deleted file mode 100644
index d8594916c0b..00000000000
--- a/mysql-test/r/alt000001.result
+++ /dev/null
@@ -1,5 +0,0 @@
-n
-3
-9
-10
-12
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
new file mode 100644
index 00000000000..349f65509a8
--- /dev/null
+++ b/mysql-test/r/alter_table.result
@@ -0,0 +1,27 @@
+bandID payoutID new_col
+6 1 NULL
+3 4 NULL
+1 6 NULL
+2 6 NULL
+4 9 NULL
+5 10 NULL
+7 12 NULL
+8 12 NULL
+bandID payoutID new_col
+1 6 NULL
+2 6 NULL
+3 4 NULL
+4 9 NULL
+5 10 NULL
+6 1 NULL
+7 12 NULL
+8 12 NULL
+Field Type Null Key Default Extra Privileges
+GROUP_ID int(10) unsigned PRI 0 select,insert,update,references
+LANG_ID smallint(5) unsigned PRI 0 select,insert,update,references
+NAME char(80) MUL select,insert,update,references
+n
+3
+9
+10
+12
diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result
new file mode 100644
index 00000000000..f6b8cc2fcbf
--- /dev/null
+++ b/mysql-test/r/analyse.result
@@ -0,0 +1,6 @@
+Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
+t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL
+t1.j 2 8 1 1 0 0 5.0000 2.2361 ENUM('2','4','6','8') NOT NULL
+Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
+t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL
+t1.j 2 8 1 1 0 0 5.0000 2.2361 ENUM('2','4','6','8') NOT NULL
diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result
new file mode 100644
index 00000000000..9ff02d7a7b8
--- /dev/null
+++ b/mysql-test/r/auto_increment.result
@@ -0,0 +1,57 @@
+a b
+1 1
+3 3
+5 5
+6 6
+a b c
+1 1 NULL
+3 3 3
+5 5 NULL
+8 8 8
+9 9 9
+a b
+1 1
+5 5
+3 3
+4 4
+6 6
+a b c
+1 1 NULL
+5 5 NULL
+3 3 NULL
+4 4 NULL
+6 6 6
+skey sval
+1 hello
+2 hey
+_rowid _rowid skey sval
+1 1 1 hello
+2 2 2 hey
+a b
+a 1
+a 2
+a 3
+a 4
+a 5
+b 2
+b 3
+b 4
+c 1
+c 2
+c 3
+d 1
+d 2
+d 5
+e 1
+k 1
+ordid ord
+1 sdj
+2 sdj
+ordid ord
+1 abc
+2 abc
+3 abc
+1 sdj
+2 sdj
+3 sdj
+1 zzz
diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result
index 1ac0a8ea62d..3d5bf5f0edb 100644
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -22,6 +22,383 @@ id code name
7 4 Matt
8 1 Sinisa
12 1 Ralph
+id parent_id level
+8 102 2
+9 102 2
+15 102 2
+id parent_id level
+1001 100 0
+1002 101 1
+1003 101 1
+1004 101 1
+1005 101 1
+1006 101 1
+1007 101 1
+1008 102 2
+1009 102 2
+1015 102 2
+1016 103 2
+1017 103 2
+1018 103 2
+1019 103 2
+1020 103 2
+1021 104 2
+1022 104 2
+1024 104 2
+1025 105 2
+1026 105 2
+1027 105 2
+1028 105 2
+1029 105 2
+1030 105 2
+1031 106 2
+1032 106 2
+1033 106 2
+1034 106 2
+1035 106 2
+1036 107 2
+1037 107 2
+1038 107 2
+1040 107 2
+1157 100 0
+1179 105 2
+1183 104 2
+1193 105 2
+1202 107 2
+1203 107 2
+id parent_id level
+1001 100 0
+1002 101 1
+1003 101 1
+1004 101 1
+1005 101 1
+1006 101 1
+1007 101 1
+1008 102 2
+1010 102 2
+1015 102 2
+1016 103 2
+1017 103 2
+1018 103 2
+1019 103 2
+1020 103 2
+1021 104 2
+1023 104 2
+1024 104 2
+1025 105 2
+1026 105 2
+1027 105 2
+1028 105 2
+1029 105 2
+1030 105 2
+1031 106 2
+1032 106 2
+1033 106 2
+1034 106 2
+1035 106 2
+1036 107 2
+1037 107 2
+1039 107 2
+1041 107 2
+1158 100 0
+1180 105 2
+1184 104 2
+1194 105 2
+1202 107 2
+1204 107 2
+id parent_id level
+1008 102 2
+1015 102 2
+1010 102 2
+table type possible_keys key key_len ref rows Extra
+t1 ref level level 1 const 1 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 ref level level 1 const 1 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 ref level level 1 const 1 where used
+level id
+1 1002
+1 1003
+1 1004
+1 1005
+1 1006
+1 1007
+level id parent_id
+1 1002 101
+1 1003 101
+1 1004 101
+1 1005 101
+1 1006 101
+1 1007 101
gesuchnr benutzer_id
1 1
2 1
+a
+2
+a b
+a 1
+a 2
+a 3
+a 4
+a 5
+b 2
+b 3
+b 4
+c 1
+c 2
+c 3
+d 1
+d 2
+d 5
+e 1
+k 1
+n after rollback
+n after commit
+4 after commit
+n after commit
+4 after commit
+5 after commit
+n
+4
+5
+6
+afterbegin_id afterbegin_nom
+1 hamdouni
+afterrollback_id afterrollback_nom
+afterautocommit0_id afterautocommit0_nom
+2 mysql
+afterrollback_id afterrollback_nom
+id val
+id val
+pippo 12
+id val
+ID NAME
+1 Jochen
+_userid
+marc@anyware.co.uk
+_userid
+marc@anyware.co.uk
+user_id name phone ref_email detail
+10292 sanjeev 29153373 sansh777@hotmail.com xxx
+10292 shirish 2333604 shirish@yahoo.com ddsds
+10292 sonali 323232 sonali@bolly.com filmstar
+user_id name phone ref_email detail
+10292 sanjeev 29153373 sansh777@hotmail.com xxx
+10292 shirish 2333604 shirish@yahoo.com ddsds
+10292 sonali 323232 sonali@bolly.com filmstar
+user_id name phone ref_email detail
+10292 sanjeev 29153373 sansh777@hotmail.com xxx
+10292 shirish 2333604 shirish@yahoo.com ddsds
+10292 sonali 323232 sonali@bolly.com filmstar
+10293 shirish 2333604 shirish@yahoo.com ddsds
+user_id name phone ref_email detail
+10293 shirish 2333604 shirish@yahoo.com ddsds
+user_id name phone ref_email detail
+10291 sanjeev 29153373 sansh777@hotmail.com xxx
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
+t1 0 PRIMARY 1 a A NULL NULL NULL
+t1 0 PRIMARY 2 b A 0 NULL NULL
+t1 0 b 1 b A 0 NULL NULL
+t1 0 c 1 c A 0 NULL NULL
+t1 1 a 1 a A NULL NULL NULL
+t1 1 a_2 1 a A NULL NULL NULL
+col1 col2
+1 1
+2 3
+3 4
+4 4
+5 2
+col1 col2
+1 1
+2 3
+3 4
+4 7
+5 2
+col1 col2 co3
+1 1 0
+2 3 0
+3 4 0
+4 7 0
+5 2 0
+col1 col2 co3
+1 1 0
+2 9 0
+3 4 0
+4 7 0
+5 2 0
+a b
+1 3
+2 3
+3 3
+a b
+1 3
+2 3
+3 3
+a b
+a b
+1 3
+2 3
+3 3
+a b
+1 3
+2 3
+3 3
+id ggid email passwd
+1 test1 xxx
+id ggid email passwd
+1 test1 xxx
+id ggid email passwd
+2 test2 yyy
+user_name password subscribed user_id quota weight access_date access_time approved dummy_primary_key
+user_0 somepassword N 0 0 0 2000-09-07 23:06:59 2000-09-07 23:06:59 1
+user_1 somepassword Y 1 1 1 2000-09-07 23:06:59 2000-09-07 23:06:59 2
+user_2 somepassword N 2 2 1.4142135623731 2000-09-07 23:06:59 2000-09-07 23:06:59 3
+user_3 somepassword Y 3 3 1.7320508075689 2000-09-07 23:06:59 2000-09-07 23:06:59 4
+user_4 somepassword N 4 4 2 2000-09-07 23:06:59 2000-09-07 23:06:59 5
+id parent_id level
+8 102 2
+9 102 2
+15 102 2
+id parent_id level
+1001 100 0
+1003 101 1
+1004 101 1
+1008 102 2
+1024 102 2
+1017 103 2
+1022 104 2
+1024 104 2
+1028 105 2
+1029 105 2
+1030 105 2
+1031 106 2
+1032 106 2
+1033 106 2
+1203 107 2
+1202 107 2
+1020 103 2
+1157 100 0
+1193 105 2
+1040 107 2
+1002 101 1
+1015 102 2
+1006 101 1
+1034 106 2
+1035 106 2
+1016 103 2
+1007 101 1
+1036 107 2
+1018 103 2
+1026 105 2
+1027 105 2
+1183 104 2
+1038 107 2
+1025 105 2
+1037 107 2
+1021 104 2
+1019 103 2
+1005 101 1
+1179 105 2
+id parent_id level
+1002 100 0
+1004 101 1
+1005 101 1
+1009 102 2
+1025 102 2
+1018 103 2
+1023 104 2
+1025 104 2
+1029 105 2
+1030 105 2
+1031 105 2
+1032 106 2
+1033 106 2
+1034 106 2
+1204 107 2
+1203 107 2
+1021 103 2
+1158 100 0
+1194 105 2
+1041 107 2
+1003 101 1
+1016 102 2
+1007 101 1
+1035 106 2
+1036 106 2
+1017 103 2
+1008 101 1
+1037 107 2
+1019 103 2
+1027 105 2
+1028 105 2
+1184 104 2
+1039 107 2
+1026 105 2
+1038 107 2
+1022 104 2
+1020 103 2
+1006 101 1
+1180 105 2
+id parent_id level
+1009 102 2
+1025 102 2
+1016 102 2
+table type possible_keys key key_len ref rows Extra
+t1 ref level level 1 const 1 where used; Using index
+level id
+1 1004
+1 1005
+1 1003
+1 1007
+1 1008
+1 1006
+level id parent_id
+1 1004 101
+1 1005 101
+1 1003 101
+1 1007 101
+1 1008 101
+1 1006 101
+level id
+1 1003
+1 1004
+1 1005
+1 1006
+1 1007
+1 1008
+id parent_id level
+1002 100 0
+1009 102 2
+1025 102 2
+1018 103 2
+1023 104 2
+1025 104 2
+1029 105 2
+1030 105 2
+1031 105 2
+1032 106 2
+1033 106 2
+1034 106 2
+1204 107 2
+1203 107 2
+1021 103 2
+1158 100 0
+1194 105 2
+1041 107 2
+1016 102 2
+1035 106 2
+1036 106 2
+1017 103 2
+1037 107 2
+1019 103 2
+1027 105 2
+1028 105 2
+1184 104 2
+1039 107 2
+1026 105 2
+1038 107 2
+1022 104 2
+1020 103 2
+1180 105 2
+count(*)
+1
diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result
new file mode 100644
index 00000000000..501f489ca86
--- /dev/null
+++ b/mysql-test/r/bigint.result
@@ -0,0 +1,13 @@
+0 256 00000000000000065536 2147483647 -2147483648 2147483648 +4294967296
+0 256 65536 2147483647 -2147483648 2147483648 4294967296
+922337203685477580 92233720368547758000
+922337203685477580 92233720368547758080
+-922337203685477580 -92233720368547758000
+-922337203685477580 -92233720368547758080
+9223372036854775807 -009223372036854775808
+9223372036854775807 -9223372036854775808
++9999999999999999999 -9999999999999999999
+10000000000000000000 -10000000000000000000
+a
+18446744073709551615
+18446744073709551615
diff --git a/mysql-test/r/binary.result b/mysql-test/r/binary.result
new file mode 100644
index 00000000000..c5f9961699d
--- /dev/null
+++ b/mysql-test/r/binary.result
@@ -0,0 +1,33 @@
+name
+concat("*",name,"*")
+*å*
+*ä*
+*ö*
+min(name) min(concat("*",name,"*")) max(name) max(concat("*",name,"*"))
+å *å* ö *ö*
+name
+concat("*",name,"*")
+*ä*
+*å*
+*ö*
+min(name) min(concat("*",name,"*")) max(name) max(concat("*",name,"*"))
+ä *ä* ö *ö*
+name
+name
+name
+a b
+hello hello
+a b
+a b
+hello hello
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
new file mode 100644
index 00000000000..66538c2fbee
--- /dev/null
+++ b/mysql-test/r/case.result
@@ -0,0 +1,34 @@
+CASE "b" when "a" then 1 when "b" then 2 END
+2
+CASE "c" when "a" then 1 when "b" then 2 END
+NULL
+CASE "c" when "a" then 1 when "b" then 2 ELSE 3 END
+3
+CASE BINARY "b" when "a" then 1 when "B" then 2 WHEN "b" then "ok" END
+ok
+CASE "b" when "a" then 1 when binary "B" then 2 WHEN "b" then "ok" END
+ok
+CASE concat("a","b") when concat("ab","") then "a" when "b" then "b" end
+a
+CASE when 1=0 then "true" else "false" END
+false
+CASE 1 when 1 then "one" WHEN 2 then "two" ELSE "more" END
+one
+CASE 2.0 when 1 then "one" WHEN 2.0 then "two" ELSE "more" END
+two
+(CASE "two" when "one" then "1" WHEN "two" then "2" END) | 0
+2
+(CASE "two" when "one" then 1.00 WHEN "two" then 2.00 END) +0.0
+2.00
+case 1/0 when "a" then "true" else "false" END
+false
+case 1/0 when "a" then "true" END
+NULL
+(case 1/0 when "a" then "true" END) | 0
+NULL
+(case 1/0 when "a" then "true" END) + 0.0
+NULL
+case when 1>0 then "TRUE" else "FALSE" END
+TRUE
+case when 1<0 then "TRUE" else "FALSE" END
+FALSE
diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result
new file mode 100644
index 00000000000..7044667e4af
--- /dev/null
+++ b/mysql-test/r/comments.result
@@ -0,0 +1,15 @@
+1+2/*hello*/+3
+6
+1
+1
+1 /*!32301 +1
+2
+1
+1
+1--1
+2
+1 --2
++1
+4
+1
+1
diff --git a/mysql-test/r/compare.result b/mysql-test/r/compare.result
new file mode 100644
index 00000000000..6af85c16dff
--- /dev/null
+++ b/mysql-test/r/compare.result
@@ -0,0 +1,6 @@
+table type possible_keys key key_len ref rows Extra
+t1 index PRIMARY PRIMARY 12 NULL 2 where used; Using index
+id
+000000000001
+id
+000000000001
diff --git a/mysql-test/r/count_distinct.result b/mysql-test/r/count_distinct.result
new file mode 100644
index 00000000000..6fc10f590ec
--- /dev/null
+++ b/mysql-test/r/count_distinct.result
@@ -0,0 +1,9 @@
+isbn city libname a
+007 Berkeley Berkeley Public1 1
+007 Berkeley Berkeley Public2 1
+000 New York New York Public Libra 6
+001 New York NYC Lib 1
+006 San Fran San Fransisco Public 1
+isbn city libname a
+007 Berkeley Berkeley Public1 2
+000 New York New York Public Libra 2
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
new file mode 100644
index 00000000000..f32c9b0bc80
--- /dev/null
+++ b/mysql-test/r/create.result
@@ -0,0 +1,10 @@
+b
+
+NULL
+b
+
+
+1a20 1e+ 1e+10
+1 10000000001
+a$1 $b c$
+1 2 3
diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result
new file mode 100644
index 00000000000..c3281ce5330
--- /dev/null
+++ b/mysql-test/r/delayed.result
@@ -0,0 +1,5 @@
+a tmsp
+a tmsp
+5 19711006010203
+6 19711006010203
+8 19711006010203
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/mysql-test/r/delete.result
+++ /dev/null
diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result
new file mode 100644
index 00000000000..79c55e45342
--- /dev/null
+++ b/mysql-test/r/distinct.result
@@ -0,0 +1,155 @@
+id
+NULL
+-1
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+id facility
+NULL NULL
+-1
+0
+1 /L
+2 A01
+3 ANC
+4 F01
+5 FBX
+6 MT
+7 P
+8 RV
+9 SRV
+10 VMT
+id-5 facility
+NULL NULL
+-6
+-5
+-4 /L
+-3 A01
+-2 ANC
+-1 F01
+0 FBX
+1 MT
+2 P
+3 RV
+4 SRV
+5 VMT
+id concat(facility)
+NULL NULL
+-1
+0
+1 /L
+2 A01
+3 ANC
+4 F01
+5 FBX
+6 MT
+7 P
+8 RV
+9 SRV
+10 VMT
+a max(id) b
+10 10 VMT
+9 9 SRV
+8 8 RV
+7 7 P
+6 6 MT
+5 5 FBX
+4 4 F01
+3 3 ANC
+2 2 A01
+1 1 /L
+-1 -1
+0 0
+NULL NULL NULL
+grp count(*)
+0 7
+1 6
+FACILITY
+NULL
+
+/L
+A01
+ANC
+F01
+FBX
+MT
+P
+RV
+SRV
+VMT
+FACILITY
+NULL
+
+/L
+A01
+ANC
+F01
+FBX
+MT
+P
+RV
+SRV
+VMT
+count(*)
+12
+count(facility)
+12
+count(*)
+13
+count(*)
+1
+count(*)
+0
+count(*)
+12
+count(*)
+1
+count(*)
+12
+UserId
+UserId
+UserId
+UserId
+b
+1
+table type possible_keys key key_len ref rows Extra
+t3 index a a 4 NULL 6 Using index; Using temporary
+t2 index a a 4 NULL 5 Using index; Distinct
+t1 eq_ref PRIMARY PRIMARY 4 t2.a 1 where used; Distinct
+a
+1
+table type possible_keys key key_len ref rows Extra
+t1 index PRIMARY PRIMARY 4 NULL 2 Using index; Using temporary
+t3 ref a a 5 t1.a 12 Using index; Distinct
+a
+1
+2
+1
+1
+name
+aa
+ab
+name
+aa
+ab
+1
+1
+key_link_id link
+NULL NULL
+table type possible_keys key key_len ref rows Extra
+t1 index id id 4 NULL 2 Using index; Using temporary
+t2 index id id 8 NULL 1 Using index; Distinct
+t3 index id id 8 NULL 1 Using index; Distinct
+j_lj_t2 index id id 4 NULL 2 where used; Using index; Distinct
+t2_lj index id id 8 NULL 1 where used; Using index; Distinct
+j_lj_t3 index id id 4 NULL 2 where used; Using index; Distinct
+t3_lj index id id 8 NULL 1 where used; Using index; Distinct
+id
+2
diff --git a/mysql-test/r/empty_table.result b/mysql-test/r/empty_table.result
new file mode 100644
index 00000000000..284ed65ee3b
--- /dev/null
+++ b/mysql-test/r/empty_table.result
@@ -0,0 +1,4 @@
+count(*)
+0
+nr b str
+nr b str
diff --git a/mysql-test/r/explain.result b/mysql-test/r/explain.result
new file mode 100644
index 00000000000..558feb10f84
--- /dev/null
+++ b/mysql-test/r/explain.result
@@ -0,0 +1,15 @@
+id str
+1 NULL
+2 NULL
+id str
+3 foo
+table type possible_keys key key_len ref rows Extra
+t1 ref str str 11 const 1 where used
+table type possible_keys key key_len ref rows Extra
+t1 const str str 11 const 1
+table type possible_keys key key_len ref rows Extra
+t1 ALL str NULL NULL NULL 4 where used
+table type possible_keys key key_len ref rows Extra
+t1 const str str 11 const 1
+Comment
+No tables used
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
new file mode 100644
index 00000000000..7d9ba18d933
--- /dev/null
+++ b/mysql-test/r/fulltext.result
@@ -0,0 +1,8 @@
+a b
+Only MyISAM tables support collections
+Full-text indexes are called collections
+a b
+Full-text indexes are called collections
+a b
+Full-text indexes are called collections
+Only MyISAM tables support collections
diff --git a/mysql-test/r/crypt.result b/mysql-test/r/func_crypt.result
index 7e0f5f7981d..7e0f5f7981d 100644
--- a/mysql-test/r/crypt.result
+++ b/mysql-test/r/func_crypt.result
diff --git a/mysql-test/r/func_date_add.result b/mysql-test/r/func_date_add.result
new file mode 100644
index 00000000000..3bc0fb1aff3
--- /dev/null
+++ b/mysql-test/r/func_date_add.result
@@ -0,0 +1,12 @@
+visitor_id mts
+48985536 20000319013932
+173865424 20000318233615
+357917728 20000319145027
+465931136 20000318160953
+1092858576 20000319013445
+visitor_id mts
+48985536 20000319013932
+173865424 20000318233615
+357917728 20000319145027
+465931136 20000318160953
+1092858576 20000319013445
diff --git a/mysql-test/r/equal.result b/mysql-test/r/func_equal.result
index 6e2933641aa..6e2933641aa 100644
--- a/mysql-test/r/equal.result
+++ b/mysql-test/r/func_equal.result
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
new file mode 100644
index 00000000000..ea9a06123ae
--- /dev/null
+++ b/mysql-test/r/func_group.result
@@ -0,0 +1,86 @@
+a c sum(a)
+1 a 1
+2 b 2
+3 c 3
+4 E 4
+5 C 5
+6 D 6
+a c sum(a)
+sum(a)
+NULL
+a
+1
+3
+6
+5
+2
+4
+a
+1
+3
+6
+5
+2
+4
+count(distinct a) count(distinct grp)
+6 3
+count(distinct a) count(distinct grp)
+6 3
+sum(a) count(a) avg(a) std(a) bit_or(a) bit_and(a) min(a) max(a) min(c) max(c)
+21 6 3.5000 1.7078 7 0 1 6 E
+grp sum(a) count(a) avg(a) std(a) bit_or(a) bit_and(a) min(a) max(a) min(c) max(c)
+NULL 0 0 NULL NULL 0 0 NULL NULL
+1 1 1 1.0000 0.0000 1 1 1 1 a a
+2 5 2 2.5000 0.5000 3 2 2 3 b c
+3 15 3 5.0000 0.8165 7 4 4 6 C E
+grp sum
+NULL NULL
+1 7
+2 20
+3 44.816496580928
+grp a c
+NULL NULL
+1 2 a
+2 5 c
+3 9 E
+2 3 c
+id avg(value1) std(value1)
+1 1.000000 0.816497
+2 11.000000 0.816497
+name avg(value1) std(value1)
+Set One 1.000000 0.816497
+Set Two 11.000000 0.816497
+id avg(rating)
+1 3.0000
+2 NULL
+3 2.0000
+count(*)
+3
+count(*)
+1
+count(*)
+0
+count(*)
+0
+count(a)
+1
+count(a)
+0
+count(a)
+0
+count(b)
+2
+count(b)
+0
+count(c)
+0
+COUNT(i) i COUNT(i)*i
+1 1 1
+COUNT(i) (i+0) COUNT(i)*(i+0)
+1 1 1
+sum(num)
+147.58
+sum(num)
+50.15
+45.63
+51.80
diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result
new file mode 100644
index 00000000000..f201d371876
--- /dev/null
+++ b/mysql-test/r/func_in.result
@@ -0,0 +1,14 @@
+field
+field
+A
+field
+A
+field
+A
+NULL
+field
+NULL
+id
+2
+5
+9
diff --git a/mysql-test/r/func_like.result b/mysql-test/r/func_like.result
new file mode 100644
index 00000000000..78bede19762
--- /dev/null
+++ b/mysql-test/r/func_like.result
@@ -0,0 +1,7 @@
+a
+abc
+abcd
+a
+test
+a
+test
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
new file mode 100644
index 00000000000..33d1dfe65e7
--- /dev/null
+++ b/mysql-test/r/func_math.result
@@ -0,0 +1,22 @@
+floor(5.5) floor(-5.5)
+5 -6
+ceiling(5.5) ceiling(-5.5)
+6 -5
+truncate(52.64,1) truncate(52.64,2) truncate(52.64,-1) truncate(52.64,-2)
+52.6 52.64 50 0
+round(5.5) round(-5.5)
+6 -6
+round(5.64,1) round(5.64,2) round(5.64,-1) round(5.64,-2)
+5.6 5.64 10 0
+abs(-10) sign(-5) sign(5) sign(0)
+10 -1 1 0
+log(exp(10)) exp(log(sqrt(10))*2)
+10.000000 10.000000
+pow(10,log10(10)) power(2,4)
+10.000000 16.000000
+rand(999999) rand()
+0.18435012473199 0.76373626176616
+PI() sin(pi()/2) cos(pi()/2) tan(pi()) cot(1) asin(1) acos(0) atan(1)
+3.141593 1.000000 0.000000 -0.000000 0.64209262 1.570796 1.570796 0.785398
+degrees(pi()) radians(360)
+180 6.2831853071796
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
new file mode 100644
index 00000000000..5448127548b
--- /dev/null
+++ b/mysql-test/r/func_misc.result
@@ -0,0 +1,8 @@
+format(1.5555,0) format(123.5555,1) format(1234.5555,2) format(12345.5555,3) format(123456.5555,4) format(1234567.5555,5) format("12345.2399",2)
+2 123.6 1,234.56 12,345.556 123,456.5555 1,234,567.55550 12,345.24
+inet_ntoa(inet_aton("255.255.255.255.255.255.255.255"))
+255.255.255.255.255.255.255.255
+inet_aton("255.255.255.255.255") inet_aton("255.255.1.255") inet_aton("0.1.255")
+1099511627775 4294902271 511
+inet_ntoa(1099511627775) inet_ntoa(4294902271) inet_ntoa(511)
+255.255.255.255.255 255.255.1.255 0.0.1.255
diff --git a/mysql-test/r/func_op.result b/mysql-test/r/func_op.result
new file mode 100644
index 00000000000..b14f575c998
--- /dev/null
+++ b/mysql-test/r/func_op.result
@@ -0,0 +1,6 @@
+1+1 1-1 1+1*2 8/5 8%5 mod(8,5) mod(8,5)|0 -(1+1)*-2
+2 0 3 1.60 3 3 3 4
+1 | (1+1) 5 & 3 bit_count(7)
+3 1 3
+1 << 32 1 << 63 1 << 64 4 >> 2 4 >> 63 1<< 63 >> 60
+4294967296 -9223372036854775808 0 1 0 8
diff --git a/mysql-test/r/func_regexp.result b/mysql-test/r/func_regexp.result
new file mode 100644
index 00000000000..05b324d0c9e
--- /dev/null
+++ b/mysql-test/r/func_regexp.result
@@ -0,0 +1,15 @@
+s1 regexp s2
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+NULL
+NULL
+NULL
+NULL
diff --git a/mysql-test/r/func_set.result b/mysql-test/r/func_set.result
new file mode 100644
index 00000000000..b82fffc3dbd
--- /dev/null
+++ b/mysql-test/r/func_set.result
@@ -0,0 +1,18 @@
+interval(55,10,20,30,40,50,60,70,80,90,100) interval(3,1,1+1,1+1+1+1) field("IBM","NCA","ICL","SUN","IBM","DIGITAL") field("A","B","C") elt(2,"ONE","TWO","THREE") interval(0,1,2,3,4) elt(1,1,2,3)|0 elt(1,1.1,1.2,1.3)+0
+5 2 4 0 TWO 0 1 1.1
+find_in_set("b","a,b,c") find_in_set("c","a,b,c") find_in_set("dd","a,bbb,dd") find_in_set("bbb","a,bbb,dd")
+2 3 3 2
+find_in_set("d","a,b,c") find_in_set("dd","a,bbb,d") find_in_set("bb","a,bbb,dd")
+0 0 0
+make_set(0,'a','b','c') make_set(-1,'a','b','c') make_set(1,'a','b','c') make_set(2,'a','b','c') make_set(1+2,concat('a','b'),'c')
+ a,b,c a b ab,c
+make_set(NULL,'a','b','c') make_set(1|4,'a',NULL,'c') make_set(1+2,'a',NULL,'c')
+NULL a,c a
+export_set(9,"Y","N","-",5) export_set(9,"Y","N") export_set(9,"Y","N","")
+Y-N-N-Y-N Y,N,N,Y,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N YNNYNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+elt(2,1) field(NULL,"a","b","c")
+NULL 0
+find_in_set("","a,b,c") find_in_set("","a,b,c,") find_in_set("",",a,b,c")
+0 4 1
+find_in_set("abc","abc") find_in_set("ab","abc") find_in_set("abcd","abc")
+1 0 0
diff --git a/mysql-test/r/strfunc.result b/mysql-test/r/func_str.result
index ac352d2ffb7..fbf3aad6636 100644
--- a/mysql-test/r/strfunc.result
+++ b/mysql-test/r/func_str.result
@@ -60,3 +60,40 @@ rpad('abcd',1,'ab') lpad('abcd',1,'ab')
a a
LEAST(NULL,'HARRY','HARRIOT',NULL,'HAROLD') GREATEST(NULL,'HARRY','HARRIOT',NULL,'HAROLD')
HAROLD HARRY
+least(1,2,3) | greatest(16,32,8) least(5,4)*1 greatest(-1.0,1.0)*1 least(3,2,1)*1.0 greatest(1,1.1,1.0) least("10",9) greatest("A","B","0")
+33 4 1.0 1.0 1.1 9 B
+decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000)
+1
+decode(encode("abcdef","monty"),"monty")="abcdef"
+1
+reverse("")
+
+insert("aa",100,1,"b") insert("aa",1,3,"b") left("aa",-1) substring("a",1,2)
+aa b a
+elt(2,1) field(NULL,"a","b","c") reverse("")
+NULL 0
+locate("a","b",2) locate("","a",1)
+0 1
+ltrim("a") rtrim("a") trim(BOTH "" from "a") trim(BOTH " " from "a")
+a a a a
+concat("1","2")|0 concat("1",".5")+0.0
+12 1.5
+substring_index("www.tcx.se","",3)
+
+length(repeat("a",100000000)) length(repeat("a",1000*64))
+NULL 64000
+position("0" in "baaa" in (1)) position("0" in "1" in (1,2,3)) position("sql" in ("mysql"))
+1 0 3
+position(("1" in (1,2,3)) in "01")
+2
+length(repeat("a",65500)) length(concat(repeat("a",32000),repeat("a",32000))) length(replace("aaaaa","a",concat(repeat("a",10000)))) length(insert(repeat("a",40000),1,30000,repeat("b",50000)))
+65500 64000 50000 60000
+length(repeat("a",1000000)) length(concat(repeat("a",32000),repeat("a",32000),repeat("a",32000))) length(replace("aaaaa","a",concat(repeat("a",32000)))) length(insert(repeat("a",48000),1,1000,repeat("a",48000)))
+1000000 96000 160000 95000
+Date Unix
+1998-9-16 09:26:00 905927160
+1998-9-16 09:26:00 905927160
+domain
+hello.de
+domain
+test.de
diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result
new file mode 100644
index 00000000000..08719a2150b
--- /dev/null
+++ b/mysql-test/r/func_system.result
@@ -0,0 +1,4 @@
+database() user()
+test test@localhost
+version()>="3.23.29"
+1
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result
new file mode 100644
index 00000000000..3dc0fc19848
--- /dev/null
+++ b/mysql-test/r/func_test.result
@@ -0,0 +1,36 @@
+0=0 1>0 1>=1 1<0 1<=0 1!=0 strcmp("abc","abcd") strcmp("b","a") strcmp("a","a")
+1 1 1 0 0 1 -1 1 0
+"a"<"b" "a"<="b" "b">="a" "b">"a" "a"="A" "a"<>"b"
+1 1 1 1 1 1
+"a "="A" "A "="a" "a " <= "A b"
+1 1 1
+"abc" like "a%" "abc" not like "%d%" "a%" like "a\%" "abc%" like "a%\%" "abcd" like "a%b_%d" "a" like "%%a" "abcde" like "a%_e" "abc" like "abc%"
+1 1 1 1 1 1 1 1
+"a" like "%%b" "a" like "%%ab" "ab" like "a\%" "ab" like "_" "ab" like "ab_" "abc" like "%_d" "abc" like "abc%d"
+0 0 0 0 0 0 0
+'?' like '|%' '?' like '|%' ESCAPE '|' '%' like '|%' '%' like '|%' ESCAPE '|' '%' like '%'
+0 0 0 1 1
+'abc' like '%c' 'abcabc' like '%c' "ab" like "" "ab" like "a" "ab" like "ab"
+1 1 0 0 1
+"Det här är svenska" regexp "h[[:alpha:]]+r" "aba" regexp "^(a|b)*$"
+1 1
+"aba" regexp concat("^","a")
+1
+!0 NOT 0=1 !(0=0) 1 AND 1 1 && 0 0 OR 1 1 || NULL 1=1 or 1=1 and 1=0
+1 1 0 1 0 1 1 1
+IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0
+this is a 2 2.0
+2 between 1 and 3 "monty" between "max" and "my" 2=2 and "monty" between "max" and "my" and 3=3
+1 1 1
+'b' between 'a' and 'c' 'B' between 'a' and 'c'
+1 1
+2 in (3,2,5,9,5,1) "monty" in ("david","monty","allan") 1.2 in (1.4,1.2,1.0)
+1 1 1
+-1.49 or -1.49 0.6 or 0.6
+1 1
+5 between 0 and 10 between 0 and 1 (5 between 0 and 10) between 0 and 1
+0 1
+1 and 2 between 2 and 10 2 between 2 and 10 and 1
+1 1
+1 and 0 or 2 2 or 1 and 0
+1 1
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
new file mode 100644
index 00000000000..c132c7dba8e
--- /dev/null
+++ b/mysql-test/r/func_time.result
@@ -0,0 +1,186 @@
+from_days(to_days("960101")) to_days(960201)-to_days("19960101") to_days(date_add(curdate(), interval 1 day))-to_days(curdate()) weekday("1997-11-29")
+1996-01-01 31 1 5
+period_add("9602",-12) period_diff(199505,"9404")
+199502 13
+now()-now() weekday(curdate())-weekday(now()) unix_timestamp()-unix_timestamp(now())
+0 0 0
+from_unixtime(unix_timestamp("1994-03-02 10:11:12")) from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s") from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0
+1994-03-02 10:11:12 1994-03-02 10:11:12 19940302101112
+sec_to_time(9001) sec_to_time(9001)+0 time_to_sec("15:12:22")
+02:30:01 23001 54742
+now()-curdate()*1000000-curtime()
+0
+strcmp(current_timestamp(),concat(current_date()," ",current_time()))
+0
+date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w")
+January Thursday 2nd 1997 97 01 02 03 04 05 4
+date_format("1997-01-02", concat("%M %W %D ","%Y %y %m %d %h %i %s %w"))
+January Thursday 2nd 1997 97 01 02 12 00 00 4
+dayofmonth("1997-01-02") dayofmonth(19970323)
+2 23
+month("1997-01-02") year("98-02-03") dayofyear("1997-12-31")
+1 1998 365
+DAYOFYEAR("1997-03-03") WEEK("1998-03-03") QUARTER(980303)
+62 9 1
+HOUR("1997-03-03 23:03:22") MINUTE("23:03:22") SECOND(230322)
+23 3 22
+week(19980101) week(19970101) week(19980101,1) week(19970101,1)
+0 1 1 1
+week(19981231) week(19971231) week(19981231,1) week(19971231,1)
+52 53 53 53
+week(19950101) week(19950101,1)
+1 0
+yearweek('1981-12-31',1) yearweek('1982-01-01',1) yearweek('1982-12-31',1) yearweek('1983-01-01',1)
+198153 198153 198252 198252
+date_format('1998-12-31','%x-%v') date_format('1999-01-01','%x-%v')
+1998-53 1998-53
+date_format('1999-12-31','%x-%v') date_format('2000-01-01','%x-%v')
+1999-52 1999-52
+yearweek('1987-01-01',1) yearweek('1987-01-01')
+198701 198653
+dayname("1962-03-03") dayname("1962-03-03")+0
+Saturday 5
+monthname("1972-03-04") monthname("1972-03-04")+0
+March 3
+time_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
+00|12|0|12|00|AM|12:00:00 AM|00|00:00:00
+time_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
+01|01|1|1|02|AM|01:02:03 AM|03|01:02:03
+time_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
+13|01|13|1|14|PM|01:14:15 PM|15|13:14:15
+time_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
+01|01|1|1|00|AM|01:00:15 AM|15|01:00:15
+date_format(concat('19980131',131415),'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w')
+13|01|13|1|14|PM|01:14:15 PM|15|13:14:15| January|Saturday|31st|1998|98|Sat|Jan|031|01|31|01|15|6
+date_format(19980021000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w')
+NULL
+date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND)
+1998-01-01 00:00:00
+date_add("1997-12-31 23:59:59",INTERVAL 1 MINUTE)
+1998-01-01 00:00:59
+date_add("1997-12-31 23:59:59",INTERVAL 1 HOUR)
+1998-01-01 00:59:59
+date_add("1997-12-31 23:59:59",INTERVAL 1 DAY)
+1998-01-01 23:59:59
+date_add("1997-12-31 23:59:59",INTERVAL 1 MONTH)
+1998-01-31 23:59:59
+date_add("1997-12-31 23:59:59",INTERVAL 1 YEAR)
+1998-12-31 23:59:59
+date_add("1997-12-31 23:59:59",INTERVAL "1:1" MINUTE_SECOND)
+1998-01-01 00:01:00
+date_add("1997-12-31 23:59:59",INTERVAL "1:1" HOUR_MINUTE)
+1998-01-01 01:00:59
+date_add("1997-12-31 23:59:59",INTERVAL "1:1" DAY_HOUR)
+1998-01-02 00:59:59
+date_add("1997-12-31 23:59:59",INTERVAL "1 1" YEAR_MONTH)
+1999-01-31 23:59:59
+date_add("1997-12-31 23:59:59",INTERVAL "1:1:1" HOUR_SECOND)
+1998-01-01 01:01:00
+date_add("1997-12-31 23:59:59",INTERVAL "1 1:1" DAY_MINUTE)
+1998-01-02 01:00:59
+date_add("1997-12-31 23:59:59",INTERVAL "1 1:1:1" DAY_SECOND)
+1998-01-02 01:01:00
+date_sub("1998-01-01 00:00:00",INTERVAL 1 SECOND)
+1997-12-31 23:59:59
+date_sub("1998-01-01 00:00:00",INTERVAL 1 MINUTE)
+1997-12-31 23:59:00
+date_sub("1998-01-01 00:00:00",INTERVAL 1 HOUR)
+1997-12-31 23:00:00
+date_sub("1998-01-01 00:00:00",INTERVAL 1 DAY)
+1997-12-31 00:00:00
+date_sub("1998-01-01 00:00:00",INTERVAL 1 MONTH)
+1997-12-01 00:00:00
+date_sub("1998-01-01 00:00:00",INTERVAL 1 YEAR)
+1997-01-01 00:00:00
+date_sub("1998-01-01 00:00:00",INTERVAL "1:1" MINUTE_SECOND)
+1997-12-31 23:58:59
+date_sub("1998-01-01 00:00:00",INTERVAL "1:1" HOUR_MINUTE)
+1997-12-31 22:59:00
+date_sub("1998-01-01 00:00:00",INTERVAL "1:1" DAY_HOUR)
+1997-12-30 23:00:00
+date_sub("1998-01-01 00:00:00",INTERVAL "1 1" YEAR_MONTH)
+1996-12-01 00:00:00
+date_sub("1998-01-01 00:00:00",INTERVAL "1:1:1" HOUR_SECOND)
+1997-12-31 22:58:59
+date_sub("1998-01-01 00:00:00",INTERVAL "1 1:1" DAY_MINUTE)
+1997-12-30 22:59:00
+date_sub("1998-01-01 00:00:00",INTERVAL "1 1:1:1" DAY_SECOND)
+1997-12-30 22:58:59
+date_add("1997-12-31 23:59:59",INTERVAL 100000 SECOND)
+1998-01-02 03:46:39
+date_add("1997-12-31 23:59:59",INTERVAL -100000 MINUTE)
+1997-10-23 13:19:59
+date_add("1997-12-31 23:59:59",INTERVAL 100000 HOUR)
+2009-05-29 15:59:59
+date_add("1997-12-31 23:59:59",INTERVAL -100000 DAY)
+1724-03-17 23:59:59
+date_add("1997-12-31 23:59:59",INTERVAL 100000 MONTH)
+NULL
+date_add("1997-12-31 23:59:59",INTERVAL -100000 YEAR)
+NULL
+date_add("1997-12-31 23:59:59",INTERVAL "10000:1" MINUTE_SECOND)
+1998-01-07 22:40:00
+date_add("1997-12-31 23:59:59",INTERVAL "-10000:1" HOUR_MINUTE)
+1996-11-10 07:58:59
+date_add("1997-12-31 23:59:59",INTERVAL "10000:1" DAY_HOUR)
+2025-05-19 00:59:59
+date_add("1997-12-31 23:59:59",INTERVAL "-100 1" YEAR_MONTH)
+1897-11-30 23:59:59
+date_add("1997-12-31 23:59:59",INTERVAL "10000:99:99" HOUR_SECOND)
+1999-02-21 17:40:38
+date_add("1997-12-31 23:59:59",INTERVAL " -10000 99:99" DAY_MINUTE)
+1970-08-11 19:20:59
+date_add("1997-12-31 23:59:59",INTERVAL "10000 99:99:99" DAY_SECOND)
+2025-05-23 04:40:38
+"1997-12-31 23:59:59" + INTERVAL 1 SECOND
+1998-01-01 00:00:00
+INTERVAL 1 DAY + "1997-12-31"
+1998-01-01
+"1998-01-01 00:00:00" - INTERVAL 1 SECOND
+1997-12-31 23:59:59
+date_sub("1998-01-02",INTERVAL 31 DAY)
+1997-12-02
+date_add("1997-12-31",INTERVAL 1 SECOND)
+1997-12-31 00:00:01
+date_add("1997-12-31",INTERVAL 1 DAY)
+1998-01-01
+date_add(NULL,INTERVAL 100000 SECOND)
+NULL
+date_add("1997-12-31 23:59:59",INTERVAL NULL SECOND)
+NULL
+date_add("1997-12-31 23:59:59",INTERVAL NULL MINUTE_SECOND)
+NULL
+date_add("9999-12-31 23:59:59",INTERVAL 1 SECOND)
+NULL
+date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND)
+NULL
+date_add('1998-01-30',Interval 1 month)
+1998-02-28
+date_add('1998-01-30',Interval '2:1' year_month)
+2000-02-29
+date_add('1996-02-29',Interval '1' year)
+1997-02-28
+extract(YEAR FROM "1999-01-02 10:11:12")
+1999
+extract(YEAR_MONTH FROM "1999-01-02")
+199901
+extract(DAY FROM "1999-01-02")
+2
+extract(DAY_HOUR FROM "1999-01-02 10:11:12")
+210
+extract(DAY_MINUTE FROM "02 10:11:12")
+21011
+extract(DAY_SECOND FROM "225 10:11:12")
+225101112
+extract(HOUR FROM "1999-01-02 10:11:12")
+10
+extract(HOUR_MINUTE FROM "10:11:12")
+1011
+extract(HOUR_SECOND FROM "10:11:12")
+101112
+extract(MINUTE FROM "10:11:12")
+11
+extract(MINUTE_SECOND FROM "10:11:12")
+1112
+extract(SECOND FROM "1999-01-02 10:11:12")
+12
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
new file mode 100644
index 00000000000..ced1a3cd178
--- /dev/null
+++ b/mysql-test/r/group_by.result
@@ -0,0 +1,32 @@
+userid MIN(t1.score)
+1 1
+2 2
+3 3
+userid MIN(t1.score)
+1 1
+2 2
+userid MIN(t1.score+0.0)
+1 1.0
+2 2.0
+cid CONCAT(firstname, ' ', surname) COUNT(call_id)
+cid CONCAT(firstname, ' ', surname) COUNT(call_id)
+value description bug_id
+BBBBBBBBBBBBB - conversion 9
+BBBBBBBBBBBBB - conversion 10
+BBBBBBBBBBBBB - generic 7
+BBBBBBBBBBBBB - generic 14
+BBBBBBBBBBBBB - eeeeeeeee NULL
+kkkkkkkkkkk lllllllllll 6
+kkkkkkkkkkk lllllllllll 8
+kkkkkkkkkkk lllllllllll 12
+Test Procedures NULL
+Documentation NULL
+Host communication NULL
+value description COUNT(bug_id)
+BBBBBBBBBBBBB - conversion 2
+BBBBBBBBBBBBB - eeeeeeeee 0
+BBBBBBBBBBBBB - generic 2
+Documentation 0
+Host communication 0
+kkkkkkkkkkk lllllllllll 3
+Test Procedures 0
diff --git a/mysql-test/r/have_raid.require b/mysql-test/r/have_raid.require
new file mode 100644
index 00000000000..8390f4dbb85
--- /dev/null
+++ b/mysql-test/r/have_raid.require
@@ -0,0 +1,2 @@
+Variable_name Value
+have_raid YES
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
new file mode 100644
index 00000000000..1bf34c6ad1b
--- /dev/null
+++ b/mysql-test/r/heap.result
@@ -0,0 +1,80 @@
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
+t1 0 PRIMARY 1 a NULL NULL NULL NULL
+a b
+2 2
+3 3
+4 4
+a b
+4 4
+a b
+2 2
+3 3
+4 6
+a b
+1 1
+2 2
+3 3
+4 4
+a
+869751
+802616
+a
+869751
+802616
+a
+736494
+a
+736494
+869751
+a
+226312
+736494
+802616
+869751
+table type possible_keys key key_len ref rows Extra
+t1 range uniq_id uniq_id 4 NULL 4 where used; Using index
+x y
+1 3
+1 1
+x y x y
+1 1 1 1
+2 2 2 2
+1 3 1 1
+2 4 2 2
+2 5 2 2
+2 6 2 2
+table type possible_keys key key_len ref rows Extra
+t1 ALL x NULL NULL NULL 6
+t2 eq_ref y y 4 t1.x 1
+max(a)
+1
+a b
+1 6
+1 5
+1 4
+1 3
+1 2
+1 1
+a b
+1 6
+1 5
+1 4
+1 3
+1 2
+1 1
+1 6
+1 5
+1 4
+1 3
+1 2
+1 1
+max(id)
+1
+max(id)
+2
+f1 f2
+16 ted
+12 ted
+12 ted
+12 ted
+12 ted
diff --git a/mysql-test/r/ins000001.result b/mysql-test/r/ins000001.result
index 0db93d6732d..283f31ffb43 100644
--- a/mysql-test/r/ins000001.result
+++ b/mysql-test/r/ins000001.result
@@ -1,4 +1,4 @@
-id domain
+id t2
1 mysql.com
2 hotmail.com
3 aol.com
diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
new file mode 100644
index 00000000000..145ec8a5cf4
--- /dev/null
+++ b/mysql-test/r/insert.result
@@ -0,0 +1,6 @@
+a
+1
+2
+3
+4
+5
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
new file mode 100644
index 00000000000..c754085ccb3
--- /dev/null
+++ b/mysql-test/r/insert_select.result
@@ -0,0 +1,13 @@
+payoutID
+1
+4
+6
+9
+10
+11
+12
+14
+16
+19
+20
+22
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
new file mode 100644
index 00000000000..00285c57a7e
--- /dev/null
+++ b/mysql-test/r/join.result
@@ -0,0 +1,9 @@
+id id
+107 107
+75 75
+id count(t2.id)
+75 1
+107 1
+id count(t2.id)
+75 1
+107 1
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
new file mode 100644
index 00000000000..ceca80dd5ae
--- /dev/null
+++ b/mysql-test/r/join_outer.result
@@ -0,0 +1,315 @@
+grp a c id a c d
+1 1 a 1 1 a 1
+3 4 E 3 4 A 4
+3 5 C 3 5 B 5
+3 6 D 3 6 C 6
+grp a c id a c d
+NULL NULL NULL NULL NULL NULL
+1 1 a 1 1 a 1
+2 2 b NULL NULL NULL NULL
+2 3 c NULL NULL NULL NULL
+3 4 E 3 4 A 4
+3 5 C 3 5 B 5
+3 6 D 3 6 C 6
+grp a c id a c d
+1 1 a 1 1 a 1
+3 4 E 3 4 A 4
+3 5 C 3 5 B 5
+3 6 D 3 6 C 6
+NULL NULL NULL 4 7 D 7
+grp a c id a c d
+1 1 a 1 1 a 1
+3 4 E 3 4 A 4
+3 5 C 3 5 B 5
+3 6 D 3 6 C 6
+NULL NULL NULL 4 7 D 7
+grp a c id a c d
+1 1 a 1 1 a 1
+2 2 b NULL NULL NULL NULL
+2 3 c NULL NULL NULL NULL
+3 4 E 3 4 A 4
+3 5 C 3 5 B 5
+3 6 D 3 6 C 6
+NULL NULL NULL NULL NULL NULL
+grp a c id a c d
+1 1 a 1 1 a 1
+2 2 b NULL NULL NULL NULL
+2 3 c NULL NULL NULL NULL
+3 4 E NULL NULL NULL NULL
+3 5 C NULL NULL NULL NULL
+3 6 D NULL NULL NULL NULL
+NULL NULL NULL NULL NULL NULL
+grp a c id a c d
+1 1 a 1 1 a 1
+1 1 a 3 4 A 4
+2 2 b 3 5 B 5
+2 3 c 3 6 C 6
+3 4 E NULL NULL NULL NULL
+3 5 C 3 6 C 6
+3 6 D 4 7 D 7
+NULL NULL NULL NULL NULL NULL
+grp a c id a c d
+1 1 a 1 1 a 1
+2 2 b NULL NULL NULL NULL
+2 3 c NULL NULL NULL NULL
+3 4 E NULL NULL NULL NULL
+3 5 C NULL NULL NULL NULL
+3 6 D NULL NULL NULL NULL
+NULL NULL NULL NULL NULL NULL
+grp a c id a c d
+3 4 E 3 4 A 4
+3 5 C 3 5 B 5
+3 6 D 3 6 C 6
+grp a c id a c d
+2 2 b NULL NULL NULL NULL
+2 3 c NULL NULL NULL NULL
+NULL NULL NULL NULL NULL NULL
+Comment
+Impossible WHERE noticed after reading const tables
+table type possible_keys key key_len ref rows Extra
+t1 ALL NULL NULL NULL NULL 7
+t2 eq_ref PRIMARY PRIMARY 8 t1.a 1 where used
+grp a c id a c d a
+1 1 a 1 1 a 1 1
+2 2 b NULL NULL NULL NULL NULL
+2 3 c NULL NULL NULL NULL NULL
+3 4 E 3 4 A 4 4
+3 5 C 3 5 B 5 5
+3 6 D 3 6 C 6 6
+NULL NULL NULL NULL NULL NULL NULL
+grp a c id a c d
+1 1 a 1 1 a 1
+3 4 E 3 4 A 4
+3 5 C 3 5 B 5
+3 6 D 3 6 C 6
+grp a c id a c d
+1 1 a 1 1 a 1
+3 4 E 3 4 A 4
+3 5 C 3 5 B 5
+3 6 D 3 6 C 6
+grp a c id a c d
+1 1 a 1 1 a 1
+usr_id uniq_id increment usr2_id c_amount max
+3 4 84676 NULL NULL NULL
+usr_id uniq_id increment usr2_id c_amount max
+3 4 84676 NULL NULL NULL
+usr_id uniq_id increment usr2_id c_amount max
+3 4 84676 NULL NULL NULL
+usr_id uniq_id increment usr2_id c_amount max
+3 4 84676 NULL NULL NULL
+usr_id uniq_id increment usr2_id c_amount max
+3 4 84676 NULL NULL NULL
+fill desc_larga_cat cred_total Grup Places PlacesOcupades
+10360 asdfggfg 6.0 0 55 0
+10360 asdfggfg 6.0 12 333 0
+10360 asdfggfg 6.0 33 8 0
+10360 asdfggfg 6.0 45 10 0
+10360 asdfggfg 6.0 55 2 0
+10360 asdfggfg 6.0 7887 85 0
+10360 asdfggfg 6.0 32767 7 0
+10361 Components i Circuits Electronics I 6.0 30 2 0
+10361 Components i Circuits Electronics I 6.0 40 3 0
+10362 Laboratori d`Ordinadors 4.5 10 12 0
+10362 Laboratori d`Ordinadors 4.5 11 111 0
+fill idPla
+10360 NULL
+10361 NULL
+10362 NULL
+fill idPla
+10360 1
+10361 NULL
+10362 NULL
+name name id
+Antonio Paz El Gato 1
+Antonio Paz Perrito 2
+Lilliana Angelovska NULL NULL
+Thimble Smith Happy 3
+name name id
+Lilliana Angelovska NULL NULL
+table type possible_keys key key_len ref rows Extra
+t1 ALL NULL NULL NULL NULL 3
+t2 ALL NULL NULL NULL NULL 3 where used; Not exists
+table type possible_keys key key_len ref rows Extra
+t1 ALL NULL NULL NULL NULL 3
+t2 ALL NULL NULL NULL NULL 3 where used
+count(*)
+4
+name name id
+Antonio Paz El Gato 1
+Antonio Paz Perrito 2
+Lilliana Angelovska NULL NULL
+Thimble Smith Happy 3
+name name id
+Lilliana Angelovska NULL NULL
+table type possible_keys key key_len ref rows Extra
+t1 ALL NULL NULL NULL NULL 3
+t2 ALL NULL NULL NULL NULL 3 where used; Not exists
+table type possible_keys key key_len ref rows Extra
+t1 ALL NULL NULL NULL NULL 3
+t2 ALL NULL NULL NULL NULL 3 where used
+count(*)
+4
+name name id id
+Antonio Paz El Gato 1 1
+Antonio Paz Perrito 2 1
+Lilliana Angelovska NULL NULL NULL
+Thimble Smith Happy 3 3
+name name id id
+Antonio Paz El Gato 1 1
+Antonio Paz Perrito 2 1
+NULL Happy 3 1
+NULL El Gato 1 2
+NULL Perrito 2 2
+NULL Happy 3 2
+NULL El Gato 1 3
+NULL Perrito 2 3
+Thimble Smith Happy 3 3
+name name id owner id
+Antonio Paz El Gato 1 1 1
+Antonio Paz Perrito 2 1 1
+Lilliana Angelovska NULL NULL NULL 1
+Thimble Smith NULL NULL NULL 1
+Antonio Paz NULL NULL NULL 2
+Lilliana Angelovska NULL NULL NULL 2
+Thimble Smith NULL NULL NULL 2
+Antonio Paz NULL NULL NULL 3
+Lilliana Angelovska NULL NULL NULL 3
+Thimble Smith Happy 3 3 3
+id str
+4 bar
+3 foo
+id str
+1 NULL
+2 NULL
+n m o n m o
+1 2 11 1 2 3
+1 2 7 1 2 3
+1 2 9 1 2 3
+1 3 9 NULL NULL NULL
+n m o n m o
+1 2 7 1 2 3
+1 2 9 1 2 3
+1 3 9 NULL NULL NULL
+1 2 11 1 2 3
+id2
+3
+id2
+3
+color name
+red apple
+yellow banana
+green lime
+black grape
+blue blueberry
+count color
+10 green
+5 black
+15 white
+7 green
+count color color name
+10 green green lime
+7 green green lime
+5 black black grape
+count name
+10 lime
+7 lime
+5 grape
+count name
+10 lime
+7 lime
+5 grape
+pcode count
+kld2000 1
+klw1000 0
+klw1020 0
+klw1500 0
+klw2000 0
+klw2001 0
+klw2002 0
+klw2500 0
+kmw1000 0
+kmw1500 0
+kmw2000 0
+kmw2001 0
+kmw2100 0
+kmw3000 0
+kmw3200 0
+kvw2000 26
+kvw2001 0
+kvw3000 36
+kvw3001 0
+kvw3002 0
+kvw3500 26
+kvw3501 0
+kvw3502 0
+kvw3800 0
+kvw3801 0
+kvw3802 0
+kvw3900 0
+kvw3901 0
+kvw3902 0
+kvw4000 0
+kvw4001 0
+kvw4002 0
+kvw4200 0
+kvw4500 0
+kvw5000 0
+kvw5001 0
+kvw5500 0
+kvw5510 0
+kvw5600 0
+kvw5601 0
+kvw6000 2
+pcode count
+kld2000 1
+klw1000 0
+klw1020 0
+klw1500 0
+klw2000 0
+klw2001 0
+klw2002 0
+klw2500 0
+kmw1000 0
+kmw1500 0
+kmw2000 0
+kmw2001 0
+kmw2100 0
+kmw3000 0
+kmw3200 0
+kvw2000 26
+kvw2001 0
+kvw3000 36
+kvw3001 0
+kvw3002 0
+kvw3500 26
+kvw3501 0
+kvw3502 0
+kvw3800 0
+kvw3801 0
+kvw3802 0
+kvw3900 0
+kvw3901 0
+kvw3902 0
+kvw4000 0
+kvw4001 0
+kvw4002 0
+kvw4200 0
+kvw4500 0
+kvw5000 0
+kvw5001 0
+kvw5500 0
+kvw5510 0
+kvw5600 0
+kvw5601 0
+kvw6000 2
+id pid rep_del id pid rep_del
+1 NULL NULL 2 1 NULL
+2 1 NULL NULL NULL NULL
+id pid rep_del id pid rep_del
+1 NULL NULL 2 1 NULL
+2 1 NULL NULL NULL NULL
+table type possible_keys key key_len ref rows Extra
+t1 ALL NULL NULL NULL NULL 2
+t2 index id id 8 NULL 1 where used; Using index; Not exists
+id name id idx
+2 no NULL NULL
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result
new file mode 100644
index 00000000000..22c30c975f0
--- /dev/null
+++ b/mysql-test/r/key.result
@@ -0,0 +1,12 @@
+value
+personal employee company
+price area type transityes shopsyes schoolsyes petsyes
+name author category email password proxy bitmap msg urlscol urlhttp timeout nbcnx creation livinguntil lang type subcat subtype reg scs capacity userISP CCident
+patnom patauteur 0 p.favre@cryo-networks.fr NULL NULL #p2sndnq6ae5g1u6t essai
+salut scol://195.242.78.119:patauteur.patnom NULL NULL NULL 950036174 -882087474 NULL 3 0 3 1 Pub/patnom/futur_divers.scs NULL pat CC1
+name_id name
+name_id name
+2 [T,U]_axpby
+name_id name
+name_id name
+2 [T,U]_axpby
diff --git a/mysql-test/r/key_diff.result b/mysql-test/r/key_diff.result
new file mode 100644
index 00000000000..5668bb01eba
--- /dev/null
+++ b/mysql-test/r/key_diff.result
@@ -0,0 +1,39 @@
+a b a b
+A B A B
+b A A B
+C c A B
+D E A B
+a a A B
+A B b A
+b A b A
+C c b A
+D E b A
+a a b A
+A B C c
+b A C c
+C c C c
+D E C c
+a a C c
+A B D E
+b A D E
+C c D E
+D E D E
+a a D E
+A B a a
+b A a a
+C c a a
+D E a a
+a a a a
+table type possible_keys key key_len ref rows Extra
+t1 ALL a NULL NULL NULL 5
+t2 ALL b NULL NULL NULL 5 where used
+a b a b
+A B b A
+a a b A
+A B a a
+a a a a
+b A A B
+C c C c
+a b
+A B
+a a
diff --git a/mysql-test/r/key_primary.result b/mysql-test/r/key_primary.result
new file mode 100644
index 00000000000..ee0c1c957dc
--- /dev/null
+++ b/mysql-test/r/key_primary.result
@@ -0,0 +1,9 @@
+t1
+ABC
+t1
+t1
+AB%
+table type possible_keys key key_len ref rows Extra
+t1 const PRIMARY PRIMARY 3 const 1
+Comment
+Impossible WHERE noticed after reading const tables
diff --git a/mysql-test/r/keywords.result b/mysql-test/r/keywords.result
new file mode 100644
index 00000000000..f49681ad93b
--- /dev/null
+++ b/mysql-test/r/keywords.result
@@ -0,0 +1,4 @@
+time date timestamp
+12:22:22 1997-02-03 19970102000000
+t1.time+0 t1.date+0 t1.timestamp+0 concat(date," ",time)
+122222 19970203 19970102000000 1997-02-03 12:22:22
diff --git a/mysql-test/r/limit.result b/mysql-test/r/limit.result
new file mode 100644
index 00000000000..0f5586e3b31
--- /dev/null
+++ b/mysql-test/r/limit.result
@@ -0,0 +1,22 @@
+a b
+0 0
+4 1
+2 1
+3 1
+a b
+0 0
+4 2
+2 2
+3 1
+a b
+0 0
+4 2
+2 2
+3 4
+a b
+0 0
+2 2
+3 4
+a b
+2 2
+3 4
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
new file mode 100644
index 00000000000..5135ce0c9e9
--- /dev/null
+++ b/mysql-test/r/merge.result
@@ -0,0 +1,109 @@
+a b
+1 Testing
+2 table
+3 t1
+1 Testing
+2 table
+3 t2
+a b
+3 t1
+3 t2
+2 table
+2 table
+1 Testing
+1 Testing
+table type possible_keys key key_len ref rows Extra
+t3 range a a 4 NULL 10 where used
+table type possible_keys key key_len ref rows Extra
+t3 range a a 4 NULL 10 where used
+a b
+10 Testing
+10 Testing
+a b
+1 Testing
+1 Testing
+2 table
+2 table
+3 t1
+3 t2
+4 Testing
+4 Testing
+5 table
+5 table
+6 t1
+6 t2
+7 Testing
+7 Testing
+8 table
+8 table
+9 t2
+9 t2
+a b
+11 table
+11 table
+12 t1
+12 t1
+13 Testing
+13 Testing
+14 table
+14 table
+15 t2
+15 t2
+16 Testing
+16 Testing
+17 table
+17 table
+18 t2
+18 t2
+19 Testing
+19 Testing
+table type possible_keys key key_len ref rows Extra
+t3 index NULL a 4 NULL 1131 Using index
+a
+699
+698
+697
+696
+695
+694
+693
+692
+691
+690
+a
+416
+415
+415
+414
+414
+413
+413
+412
+412
+411
+c
+test1
+test1
+test1
+test2
+test2
+test2
+c
+test1
+test1
+test1
+test2
+test2
+test2
+c
+c
+test1
+test1
+test1
+incr othr
+incr othr
+1 10
+2 24
+4 33
+3 53
+c
diff --git a/mysql-test/r/mrg000001.dummy.result b/mysql-test/r/mrg000001.dummy.result
deleted file mode 100644
index 4c969dfa3bf..00000000000
--- a/mysql-test/r/mrg000001.dummy.result
+++ /dev/null
@@ -1 +0,0 @@
-incr othr
diff --git a/mysql-test/r/mrg000001.result b/mysql-test/r/mrg000001.result
deleted file mode 100644
index 97dc723f349..00000000000
--- a/mysql-test/r/mrg000001.result
+++ /dev/null
@@ -1,5 +0,0 @@
-incr othr
-1 10
-2 24
-4 33
-3 53
diff --git a/mysql-test/r/mrg000002.result b/mysql-test/r/mrg000002.result
deleted file mode 100644
index f2ad6c76f01..00000000000
--- a/mysql-test/r/mrg000002.result
+++ /dev/null
@@ -1 +0,0 @@
-c
diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result
new file mode 100644
index 00000000000..6109456b8c0
--- /dev/null
+++ b/mysql-test/r/null.result
@@ -0,0 +1,25 @@
+NULL NULL isnull(null) isnull(1/0) isnull(1/0 = null) ifnull(null,1) ifnull(null,"TRUE") ifnull("TRUE","ERROR") 1/0 is null 1 is not null
+NULL NULL 1 1 1 1 TRUE TRUE 1 1
+1 | NULL 1 & NULL 1+NULL 1-NULL
+NULL NULL NULL NULL
+NULL=NULL NULL<>NULL IFNULL(NULL,1.1)+0 IFNULL(NULL,1) | 0
+NULL NULL 1.1 1
+strcmp("a",NULL) (1<NULL)+0.0 NULL regexp "a" null like "a%" "a%" like null
+NULL NULL NULL NULL NULL
+concat("a",NULL) replace(NULL,"a","b") replace("string","i",NULL) replace("string",NULL,"i") insert("abc",1,1,NULL) left(NULL,1)
+NULL NULL NULL NULL NULL NULL
+repeat("a",0) repeat("ab",5+5) repeat("ab",-1) reverse(NULL)
+ abababababababababab NULL
+field(NULL,"a","b","c")
+0
+2 between null and 1 2 between 3 AND NULL NULL between 1 and 2 2 between NULL and 3 2 between 1 AND null
+0 0 NULL NULL NULL
+NULL AND NULL 1 AND NULL NULL AND 1 NULL OR NULL 0 OR NULL NULL OR 0
+NULL NULL NULL NULL NULL NULL
+(NULL OR NULL) IS NULL
+1
+NULL AND 0 0 and NULL
+NULL 0
+inet_ntoa(null) inet_aton(null) inet_aton("122.256") inet_aton("122.226.") inet_aton("")
+NULL NULL NULL NULL NULL
+x
diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result
new file mode 100644
index 00000000000..6357f0b4682
--- /dev/null
+++ b/mysql-test/r/null_key.result
@@ -0,0 +1,94 @@
+table type possible_keys key key_len ref rows Extra
+t1 ref a a 5 const 3 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 9 const,const 1 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 9 const,const 1 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 const a,b a 9 const,const 1
+table type possible_keys key key_len ref rows Extra
+t1 index NULL a 8 NULL 12 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 range a,b a 9 NULL 3 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b b 4 const 2 where used
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 5 const 3 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 range a,b a 9 NULL 2 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 range a a 5 NULL 1 where used; Using index
+table type possible_keys key key_len ref rows Extra
+t1 range a a 5 NULL 1 where used; Using index
+a b
+NULL 7
+NULL 9
+NULL 9
+a b
+NULL 7
+a b
+1 1
+2 2
+a b
+1 1
+2 2
+a b
+NULL 9
+NULL 9
+a b
+NULL 7
+7 7
+a b
+NULL 7
+NULL 9
+NULL 9
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 5 const 3 where used
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 5 const 3 where used
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 5 const 3 where used
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 5 const 1 where used
+table type possible_keys key key_len ref rows Extra
+t1 ALL NULL NULL NULL NULL 12 where used
+table type possible_keys key key_len ref rows Extra
+t1 range a,b a 5 NULL 12 where used
+table type possible_keys key key_len ref rows Extra
+t1 range a,b a 5 NULL 4 where used
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 5 const 3 where used
+table type possible_keys key key_len ref rows Extra
+t1 ref a,b a 5 const 3 where used
+table type possible_keys key key_len ref rows Extra
+t1 range a a 5 NULL 1 where used
+table type possible_keys key key_len ref rows Extra
+t1 range a,b a 5 NULL 4 where used
+table type possible_keys key key_len ref rows Extra
+t1 range a a 5 NULL 1 where used
+table type possible_keys key key_len ref rows Extra
+t1 range b b 12 NULL 1 where used
+a b c
+NULL 7 0
+NULL 9 0
+NULL 9 0
+a b c
+NULL 7 0
+a b c
+1 1 0
+2 2 0
+a b c
+1 1 0
+2 2 0
+a b c
+NULL 9 0
+NULL 9 0
+a b c
+NULL 7 0
+7 7 0
+a b c
+NULL 7 0
+NULL 9 0
+NULL 9 0
+a b c
+6 6 0
diff --git a/mysql-test/r/odbc.result b/mysql-test/r/odbc.result
new file mode 100644
index 00000000000..753d80e4539
--- /dev/null
+++ b/mysql-test/r/odbc.result
@@ -0,0 +1,7 @@
+{fn length("hello")} 1997-10-20
+5 1997-10-20
+a b
+2 2
+a b
+Comment
+Impossible WHERE noticed after reading const tables
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
new file mode 100644
index 00000000000..f550e471c4b
--- /dev/null
+++ b/mysql-test/r/order_by.result
@@ -0,0 +1,110 @@
+id idservice ordre description
+2 1 10 Emettre un appel d'offres
+2 3 40000 Créer une fiche de client
+2 4 40010 Modifier des clients
+2 5 40020 Effacer des clients
+2 6 51050 Ajouter un service
+2 7 51060 Liste des t2
+name
+Allan Larsson
+David Axmark
+Michael Widenius
+name
+Axmark David
+Larsson Allan
+Widenius Michael
+i
+1
+2
+3
+i
+1
+3
+2
+i
+3
+2
+1
+i
+3
+2
+1
+i
+2
+1
+3
+id col1 col2
+4 1 1
+3 1 2
+5 1 4
+2 2 1
+1 2 2
+6 2 3
+8 2 4
+7 3 1
+col1
+2
+2
+1
+1
+1
+2
+3
+2
+id
+1
+1
+1
+2
+2
+2
+2
+3
+id
+2
+2
+1
+1
+1
+2
+3
+2
+test
+1
+2
+3
+7
+a b if(b = 1,i,if(b = 2,v,''))
+1 1 50
+2 1 25
+3 2 123 Park Place
+4 2 453 Boardwalk
+a b if(b = 1,i,if(b = 2,v,''))
+1 1 50
+2 1 25
+3 2 123 Park Place
+4 2 453 Boardwalk
+DateOfAction TransactionID
+1999-07-18 486
+1999-07-19 87
+1999-07-19 89
+1999-07-19 92
+1999-07-19 94
+1999-07-27 828
+1999-07-27 832
+1999-07-27 834
+1999-07-27 840
+2000-03-27 490
+2000-03-28 753
+DateOfAction TransactionID
+1999-07-19 87
+1999-07-19 89
+1999-07-19 92
+1999-07-19 94
+1999-07-18 486
+2000-03-27 490
+2000-03-28 753
+1999-07-27 828
+1999-07-27 832
+1999-07-27 834
+1999-07-27 840
diff --git a/mysql-test/r/raid.result b/mysql-test/r/raid.result
new file mode 100644
index 00000000000..ffda2a6966d
--- /dev/null
+++ b/mysql-test/r/raid.result
@@ -0,0 +1,8 @@
+count(*)
+450
+count(*)
+450
+count(*)
+450
+count(*)
+450
diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
new file mode 100644
index 00000000000..e0e43f44a4b
--- /dev/null
+++ b/mysql-test/r/range.result
@@ -0,0 +1,57 @@
+event_date type event_id
+1999-07-10 100100 24
+1999-07-11 100100 25
+1999-07-13 100600 0
+1999-07-13 100600 4
+1999-07-13 100600 26
+1999-07-14 100600 10
+Comment
+Impossible WHERE
+event_date type event_id
+1999-07-10 100100 24
+1999-07-11 100100 25
+1999-07-13 100600 0
+1999-07-13 100600 4
+1999-07-13 100600 26
+1999-07-14 100600 10
+1999-07-15 100600 16
+YEAR ISSUE
+1999 29
+1999 30
+1999 31
+1999 32
+1999 33
+1999 34
+1999 35
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+id parent_id level
+3 1 1
+4 1 1
+2 1 1
+6 1 1
+7 1 1
+5 1 1
+id parent_id level
+2 1 1
+3 1 1
+4 1 1
+5 1 1
+6 1 1
+7 1 1
+Satellite SensorMode FullImageCornersUpperLeftLongitude FullImageCornersUpperRightLongitude FullImageCornersUpperRightLatitude FullImageCornersLowerRightLatitude
+OV-3 PAN1 91 -92 40 50
+aString
+baaa
+believe
+believe in love
+aString
+believe in myself
+aString
+baaa
+believe
+believe in love
+aString
+believe in myself
diff --git a/mysql-test/r/rename.result b/mysql-test/r/rename.result
new file mode 100644
index 00000000000..57ef20e41b1
--- /dev/null
+++ b/mysql-test/r/rename.result
@@ -0,0 +1,14 @@
+3 table 3
+3 table 3
+1 table 1
+1 table 1
+Tables_in_test (t_)
+t1
+t2
+t3
+1 table 1
+1 table 1
+2 table 2
+2 table 2
+3 table 3
+3 table 3
diff --git a/mysql-test/r/rollback.result b/mysql-test/r/rollback.result
new file mode 100644
index 00000000000..ac3743e1dc7
--- /dev/null
+++ b/mysql-test/r/rollback.result
@@ -0,0 +1,3 @@
+n
+4
+5
diff --git a/mysql-test/r/sel000004.result b/mysql-test/r/sel000004.result
deleted file mode 100644
index 81b7f808dd5..00000000000
--- a/mysql-test/r/sel000004.result
+++ /dev/null
@@ -1,2 +0,0 @@
-1+1 1-1 1+1*2 8/5 8%5 MOD(8,5) MOD(8,5)|0 -(1+1)*-2 SIGN(-5)
-2 0 3 1.60 3 3 3 4 -1
diff --git a/mysql-test/r/sel000005.result b/mysql-test/r/sel000005.result
deleted file mode 100644
index 0b81584ba16..00000000000
--- a/mysql-test/r/sel000005.result
+++ /dev/null
@@ -1,2 +0,0 @@
-FLOOR(5.5) FLOOR(-5.5) CEILING(5.5) CEILING(-5.5) ROUND(5.5) ROUND(-5.5)
-5 -6 6 -5 6 -6
diff --git a/mysql-test/r/sel000006.result b/mysql-test/r/sel000006.result
deleted file mode 100644
index 78876f03c96..00000000000
--- a/mysql-test/r/sel000006.result
+++ /dev/null
@@ -1,2 +0,0 @@
-ROUND(5.64,1) ROUND(5.64,2) ROUND(5.64,-1) ROUND(5.64,-2)
-5.6 5.64 10 0
diff --git a/mysql-test/r/sel000007.result b/mysql-test/r/sel000007.result
deleted file mode 100644
index a1243aa547f..00000000000
--- a/mysql-test/r/sel000007.result
+++ /dev/null
@@ -1,2 +0,0 @@
-TRUNCATE(52.64,1) TRUNCATE(52.64,2) TRUNCATE(52.64,-1) TRUNCATE(52.64,-2)
-52.6 52.64 50 0
diff --git a/mysql-test/r/sel000008.result b/mysql-test/r/sel000008.result
deleted file mode 100644
index 8129d7951f5..00000000000
--- a/mysql-test/r/sel000008.result
+++ /dev/null
@@ -1,2 +0,0 @@
-ABS(-10) LOG(EXP(10)) EXP(LOG(SQRT(10))*2) POW(10,LOG10(10)) RAND(999999) RAND() POWER(2,4)
-10 10.000000 10.000000 10.000000 0.18435012473199 0.76373626176616 16.000000
diff --git a/mysql-test/r/sel000009.result b/mysql-test/r/sel000009.result
deleted file mode 100644
index 5118e2d3966..00000000000
--- a/mysql-test/r/sel000009.result
+++ /dev/null
@@ -1,2 +0,0 @@
-PI() SIN(PI()/2) COS(PI()/2) TAN(PI()) COT(1) ASIN(1) ACOS(0) ATAN(1)
-3.141593 1.000000 0.000000 -0.000000 0.64209262 1.570796 1.570796 0.785398
diff --git a/mysql-test/r/sel000010.result b/mysql-test/r/sel000010.result
deleted file mode 100644
index 2a76c331cb3..00000000000
--- a/mysql-test/r/sel000010.result
+++ /dev/null
@@ -1,2 +0,0 @@
-1 | (1+1) 5 & 3 BIT_COUNT(7)
-3 1 3
diff --git a/mysql-test/r/sel000011.result b/mysql-test/r/sel000011.result
deleted file mode 100644
index 00ca3a4d917..00000000000
--- a/mysql-test/r/sel000011.result
+++ /dev/null
@@ -1,2 +0,0 @@
-1 << 32 1 << 63 1 << 64 4 >> 2 4 >> 63 1<< 63 >> 60
-4294967296 -9223372036854775808 0 1 0 8
diff --git a/mysql-test/r/sel000012.result b/mysql-test/r/sel000012.result
deleted file mode 100644
index 79108ddfd9f..00000000000
--- a/mysql-test/r/sel000012.result
+++ /dev/null
@@ -1,2 +0,0 @@
-10 10.0 10. .1e+2 100.0e-1
-10 10.0 10 10 10
diff --git a/mysql-test/r/sel000013.result b/mysql-test/r/sel000013.result
deleted file mode 100644
index 9c1be0bf4b2..00000000000
--- a/mysql-test/r/sel000013.result
+++ /dev/null
@@ -1,2 +0,0 @@
-6e-05 -6e-05 --6e-05 -6e-05+1.000000
-6e-05 -6e-05 6e-05 0.99994
diff --git a/mysql-test/r/sel000014.result b/mysql-test/r/sel000014.result
deleted file mode 100644
index ad3c1f9a0a3..00000000000
--- a/mysql-test/r/sel000014.result
+++ /dev/null
@@ -1,2 +0,0 @@
-0 256 00000000000000065536 2147483647 -2147483648 2147483648 +4294967296
-0 256 65536 2147483647 -2147483648 2147483648 4294967296
diff --git a/mysql-test/r/sel000015.result b/mysql-test/r/sel000015.result
deleted file mode 100644
index 61e880eee90..00000000000
--- a/mysql-test/r/sel000015.result
+++ /dev/null
@@ -1,2 +0,0 @@
-922337203685477580 92233720368547758000
-922337203685477580 92233720368547758080
diff --git a/mysql-test/r/sel000016.result b/mysql-test/r/sel000016.result
deleted file mode 100644
index a5deee463f4..00000000000
--- a/mysql-test/r/sel000016.result
+++ /dev/null
@@ -1,2 +0,0 @@
--922337203685477580 -92233720368547758000
--922337203685477580 -92233720368547758080
diff --git a/mysql-test/r/sel000017.result b/mysql-test/r/sel000017.result
deleted file mode 100644
index 62c695d4cd9..00000000000
--- a/mysql-test/r/sel000017.result
+++ /dev/null
@@ -1,2 +0,0 @@
-9223372036854775807 -009223372036854775808
-9223372036854775807 -9223372036854775808
diff --git a/mysql-test/r/sel000018.result b/mysql-test/r/sel000018.result
deleted file mode 100644
index 60c53c39bb5..00000000000
--- a/mysql-test/r/sel000018.result
+++ /dev/null
@@ -1,2 +0,0 @@
-+9999999999999999999 -9999999999999999999
-10000000000000000000 -10000000000000000000
diff --git a/mysql-test/r/sel000019.result b/mysql-test/r/sel000019.result
deleted file mode 100644
index c08322d34eb..00000000000
--- a/mysql-test/r/sel000019.result
+++ /dev/null
@@ -1,2 +0,0 @@
-DEGREES(PI()) RADIANS(360)
-180 6.2831853071796
diff --git a/mysql-test/r/sel000020.result b/mysql-test/r/sel000020.result
deleted file mode 100644
index 5be406f52c6..00000000000
--- a/mysql-test/r/sel000020.result
+++ /dev/null
@@ -1,2 +0,0 @@
-0=0 1>0 1>=1 1<0 1<=0 1!=0 STRCMP("abc","abcd") STRCMP("b","a") STRCMP("a","a")
-1 1 1 0 0 1 -1 1 0
diff --git a/mysql-test/r/sel000021.result b/mysql-test/r/sel000021.result
deleted file mode 100644
index 8ad4705eb95..00000000000
--- a/mysql-test/r/sel000021.result
+++ /dev/null
@@ -1,2 +0,0 @@
-"a"<"b" "a"<="b" "b">="a" "b">"a" "a"="A" "a"<>"b"
-1 1 1 1 1 1
diff --git a/mysql-test/r/sel000022.result b/mysql-test/r/sel000022.result
deleted file mode 100644
index 43006335b13..00000000000
--- a/mysql-test/r/sel000022.result
+++ /dev/null
@@ -1,2 +0,0 @@
-"a "="A" "A "="a" "a " <= "A b"
-1 1 1
diff --git a/mysql-test/r/sel000023.result b/mysql-test/r/sel000023.result
deleted file mode 100644
index 0f88219b1c3..00000000000
--- a/mysql-test/r/sel000023.result
+++ /dev/null
@@ -1,2 +0,0 @@
-"abc" LIKE "a%" "abc" NOT LIKE "%d%" "a%" LIKE "a\%" "abc%" LIKE "a%\%" "abcd" LIKE "a%b_%d" "a" LIKE "%%a" "abcde" LIKE "a%_e" "abc" LIKE "abc%"
-1 1 1 1 1 1 1 1
diff --git a/mysql-test/r/sel000024.result b/mysql-test/r/sel000024.result
deleted file mode 100644
index a0ceee902bd..00000000000
--- a/mysql-test/r/sel000024.result
+++ /dev/null
@@ -1,2 +0,0 @@
-"a" LIKE "%%b" "a" LIKE "%%ab" "ab" LIKE "a\%" "ab" LIKE "_" "ab" LIKE "ab_" "abc" LIKE "%_d" "abc" LIKE "abc%d"
-0 0 0 0 0 0 0
diff --git a/mysql-test/r/sel000025.result b/mysql-test/r/sel000025.result
deleted file mode 100644
index 12a2cce2067..00000000000
--- a/mysql-test/r/sel000025.result
+++ /dev/null
@@ -1,2 +0,0 @@
-'?' LIKE '|%' '?' LIKE '|%' ESCAPE '|' '%' LIKE '|%' '%' LIKE '|%' ESCAPE '|' '%' LIKE '%'
-0 0 0 1 1
diff --git a/mysql-test/r/sel000026.result b/mysql-test/r/sel000026.result
deleted file mode 100644
index 1f268717bcc..00000000000
--- a/mysql-test/r/sel000026.result
+++ /dev/null
@@ -1,2 +0,0 @@
-'abc' LIKE '%c' 'abcabc' LIKE '%c' "ab" LIKE "" "ab" LIKE "a" "ab" LIKE "ab"
-1 1 0 0 1
diff --git a/mysql-test/r/sel000027.result b/mysql-test/r/sel000027.result
deleted file mode 100644
index 0541b8a7037..00000000000
--- a/mysql-test/r/sel000027.result
+++ /dev/null
@@ -1,2 +0,0 @@
-"Det här är svenska" REGEXP "h[[:alpha:]]+r" "aba" REGEXP "^(a|b)*$"
-1 1
diff --git a/mysql-test/r/sel000028.result b/mysql-test/r/sel000028.result
deleted file mode 100644
index ecb81bdbf23..00000000000
--- a/mysql-test/r/sel000028.result
+++ /dev/null
@@ -1,2 +0,0 @@
-"aba" REGEXP CONCAT("^","a")
-1
diff --git a/mysql-test/r/sel000029.result b/mysql-test/r/sel000029.result
deleted file mode 100644
index 2df43a28462..00000000000
--- a/mysql-test/r/sel000029.result
+++ /dev/null
@@ -1,2 +0,0 @@
-!0 NOT 0=1 !(0=0) 1 AND 1 1 && 0 0 OR 1 1 || NULL 1=1 OR 1=1 AND 1=0
-1 1 0 1 0 1 1 1
diff --git a/mysql-test/r/sel000030.result b/mysql-test/r/sel000030.result
deleted file mode 100644
index 460df893025..00000000000
--- a/mysql-test/r/sel000030.result
+++ /dev/null
@@ -1,2 +0,0 @@
-IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0
-this is a 2 2.0
diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result
new file mode 100644
index 00000000000..1111ba00cd9
--- /dev/null
+++ b/mysql-test/r/select_safe.result
@@ -0,0 +1,10 @@
+a b
+1 test
+a b
+1 test
+2 test2
+1
+1
+1
+1
+1
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
new file mode 100644
index 00000000000..63a9f4a8aad
--- /dev/null
+++ b/mysql-test/r/show_check.result
@@ -0,0 +1,36 @@
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+Table Op Msg_type Msg_text
+test.t1 check status OK
+test.t2 check error The handler for the table doesn't support check/repair
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+test.t2 repair error The handler for the table doesn't support check/repair
+Table Op Msg_type Msg_text
+test.t2 check error The handler for the table doesn't support check/repair
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t2 check error Table 't2' was not locked with LOCK TABLES
+test.t1 check status OK
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
+t1 0 PRIMARY 1 a A 4 NULL NULL
+t1 1 b 1 b A 1 NULL NULL
+t1 1 b 2 c A 2 NULL NULL
+Table Op Msg_type Msg_text
+test.t1 check status Table is already up to date
+Table Op Msg_type Msg_text
+test.t1 check status Table is already up to date
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
+t1 0 PRIMARY 1 a A 5 NULL NULL
+t1 1 b 1 b A 1 NULL NULL
+t1 1 b 2 c A 2 NULL NULL
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+Table Op Msg_type Msg_text
+test.t1 optimize status Table is already up to date
diff --git a/mysql-test/r/tablelock.result b/mysql-test/r/tablelock.result
new file mode 100644
index 00000000000..4fbeac979b1
--- /dev/null
+++ b/mysql-test/r/tablelock.result
@@ -0,0 +1,12 @@
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t1 check status OK
+Table Op Msg_type Msg_text
+test.t1 check status OK
diff --git a/mysql-test/r/temp_table.result b/mysql-test/r/temp_table.result
new file mode 100644
index 00000000000..12e76bba3f7
--- /dev/null
+++ b/mysql-test/r/temp_table.result
@@ -0,0 +1,30 @@
+c d
+1
+2 a
+3 b
+a b
+4 e
+5 f
+6 g
+a b
+4 e
+5 f
+6 g
+a b
+4 e
+5 f
+6 g
+c d
+1
+2 a
+3 b
+c d e
+1 2
+2 a 2
+3 b 2
+CONCAT_WS(pkCrash, strCrash)
+1
+id val elt(two.val,'one','two')
+1 1 one
+2 1 one
+4 2 two
diff --git a/mysql-test/r/truncate.result b/mysql-test/r/truncate.result
new file mode 100644
index 00000000000..716b38c57c7
--- /dev/null
+++ b/mysql-test/r/truncate.result
@@ -0,0 +1,4 @@
+count(*)
+0
+count(*)
+1
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
new file mode 100644
index 00000000000..3190c3a29e6
--- /dev/null
+++ b/mysql-test/r/type_blob.result
@@ -0,0 +1,289 @@
+last_insert_id()
+3
+nr b str nr b str
+1 a A 1 a A
+2 bbb BBB 1 a A
+3 ccc CCC 1 a A
+1 a A 2 bbb BBB
+2 bbb BBB 2 bbb BBB
+3 ccc CCC 2 bbb BBB
+1 a A 3 ccc CCC
+2 bbb BBB 3 ccc CCC
+3 ccc CCC 3 ccc CCC
+a
+Where
+Field Type Null Key Default Extra Privileges
+t text YES NULL select,insert,update,references
+c varchar(10) YES NULL select,insert,update,references
+b blob YES NULL select,insert,update,references
+d varchar(10) binary YES NULL select,insert,update,references
+Field Type Null Key Default Extra Privileges
+t text YES NULL select,insert,update,references
+c varchar(10) YES NULL select,insert,update,references
+b blob YES NULL select,insert,update,references
+d varchar(10) binary YES NULL select,insert,update,references
+t
+hello
+HELLO
+c
+hello
+HELLO
+b
+hello
+d
+hello
+c
+hello
+HELLO
+d
+hello
+t
+hello
+HELLO
+HELLO MY
+c
+hello
+HELLO
+HELLO MY
+b
+HELLO
+HELLO MY
+d
+HELLO
+HELLO MY
+c
+hello
+HELLO
+HELLO MY
+d
+HELLO
+HELLO MY
+t
+NULL
+NULL
+
+1
+a
+hello
+HELLO
+HELLO MY
+c
+NULL
+NULL
+
+
+a
+hello
+HELLO
+HELLO MY
+b
+NULL
+NULL
+NULL
+
+HELLO
+HELLO MY
+a
+hello
+d
+NULL
+NULL
+
+1
+HELLO
+HELLO MY
+a
+hello
+t
+NULL
+
+hello
+HELLO MY
+a
+1
+b
+NULL
+
+hello
+HELLO
+HELLO MY
+a
+t
+NULL
+
+1
+a
+hello
+HELLO MY
+b
+NULL
+
+HELLO
+HELLO MY
+a
+hello
+t
+NULL
+
+1
+a
+hello
+HELLO MY
+b
+NULL
+
+HELLO
+HELLO MY
+a
+hello
+t
+NULL
+
+hello
+HELLO MY
+a
+1
+b
+NULL
+
+hello
+HELLO
+HELLO MY
+a
+t
+NULL
+
+1
+a
+hello
+HELLO MY
+b
+NULL
+
+HELLO
+HELLO MY
+a
+hello
+c
+NULL
+
+hello
+HELLO MY
+a
+d
+NULL
+
+hello
+HELLO
+HELLO MY
+a
+1
+c
+NULL
+
+a
+hello
+HELLO MY
+d
+NULL
+
+1
+HELLO
+HELLO MY
+a
+hello
+c
+NULL
+
+a
+hello
+HELLO MY
+d
+NULL
+
+1
+HELLO
+HELLO MY
+a
+hello
+t c b d
+NULL NULL NULL NULL
+
+hello hello hello hello
+HELLO HELLO HELLO HELLO
+HELLO MY HELLO MY HELLO MY HELLO MY
+a a a a
+1 NULL 1
+t count(*)
+NULL 2
+ 1
+1 1
+a 1
+hello 2
+HELLO MY 1
+b count(*)
+NULL 3
+ 1
+HELLO 1
+HELLO MY 1
+a 1
+hello 1
+c count(*)
+NULL 2
+ 2
+a 1
+hello 2
+HELLO MY 1
+d count(*)
+NULL 2
+ 1
+1 1
+HELLO 1
+HELLO MY 1
+a 1
+hello 1
+_field_140 min(t3._field_131) min(t3._field_135) min(t3._field_139) min(t3._field_137) min(link_alias_142._field_165) min(link_alias_133._field_72) min(t3._field_145) min(link_alias_148._field_156) min(t3._field_140) t3_id
+test
+job
+1 test job 1 0000-00-00 00:00:00 1999-02-25 22:43:32 0 High admin 0 tomato test
+job
+1 1
+stamp
+19990402000000
+stamp
+19990402000000
+date_format(a,"%Y %y") year(a) year(now())
+2000 00 2000 2000
+ix
+19991101000000
+19990102030405
+19990630232922
+19990601000000
+19990930232922
+19990531232922
+19990501000000
+19991101000000
+19990501000000
+date date_time time_stamp
+1998-12-31 1998-12-31 23:59:59 19981231235959
+1999-01-01 1999-01-01 00:00:00 19990101000000
+1999-09-09 1999-09-09 23:59:59 19990909235959
+2000-01-01 2000-01-01 00:00:00 20000101000000
+2000-02-28 2000-02-28 00:00:00 20000228000000
+2000-02-29 2000-02-29 00:00:00 20000229000000
+2000-03-01 2000-03-01 00:00:00 20000301000000
+2000-12-31 2000-12-31 23:59:59 20001231235959
+2001-01-01 2001-01-01 00:00:00 20010101000000
+2004-12-31 2004-12-31 23:59:59 20041231235959
+2005-01-01 2005-01-01 00:00:00 20050101000000
+2030-01-01 2030-01-01 00:00:00 20300101000000
+2050-01-01 2050-01-01 00:00:00 20131126000036
+a reverse(a)
+empty ytpme
+
+a
+hello
+hello
+hello word
+count(*)
+2
diff --git a/mysql-test/r/type_date.result b/mysql-test/r/type_date.result
new file mode 100644
index 00000000000..9aa6d6fb9b7
--- /dev/null
+++ b/mysql-test/r/type_date.result
@@ -0,0 +1,20 @@
+a b c
+test 2000-01-01 2000-01-01 2000-01-01 00:00:00
+a b c
+test 2000-01-01 2000-01-01 2000-01-01 00:00:00
+name cdate note
+name1 1998-01-01 note01
+name2 1998-01-01 note01
+datum
+2000-01-02
+2000-01-03
+2000-01-04
+s
+1998-01-02
+s
+1998-01-04
+s
+19980104
+date_add(date,INTERVAL 1 DAY) date_add(date,INTERVAL 1 SECOND)
+2000-08-11 2000-08-10 00:00:01
+2000-08-12 2000-08-11 00:00:01
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
new file mode 100644
index 00000000000..3a816e2ff68
--- /dev/null
+++ b/mysql-test/r/type_datetime.result
@@ -0,0 +1,33 @@
+t
+2000-01-01 00:00:00
+2069-12-31 00:00:00
+1970-01-01 00:00:00
+1999-12-31 00:00:00
+1000-01-01 00:00:00
+9999-12-31 00:00:00
+2000-01-01 00:00:00
+2069-12-31 00:00:00
+1970-01-01 00:00:00
+1999-12-31 23:59:59
+1000-01-01 00:00:00
+9999-12-31 23:59:59
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+t
+2000-01-01 00:00:00
+2069-12-31 00:00:00
+1970-01-01 00:00:00
+1999-12-31 00:00:00
+0000-01-01 00:00:00
+0001-01-01 00:00:00
+9999-12-31 00:00:00
+2000-10-10 00:00:00
+2069-12-31 00:00:00
+1970-01-01 00:00:00
+1999-12-31 23:59:59
+1000-01-01 00:00:00
+9999-12-31 23:59:59
+date_format(a,"%Y-%m-%d")=b right(a,6)=c+0 a=d+0
+1 1 1
+a
+0000-00-00 00:00:00
diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result
new file mode 100644
index 00000000000..de48527edad
--- /dev/null
+++ b/mysql-test/r/type_enum.result
@@ -0,0 +1,1616 @@
+field
+001001
+001010
+001018
+001020
+001021
+001027
+001028
+001030
+001031
+001100
+002003
+002004
+002005
+002007
+002008
+002009
+002012
+002013
+002014
+003002
+003003
+003004
+003005
+003006
+003007
+003008
+003009
+003010
+003011
+003012
+003013
+003014
+003015
+003016
+003017
+003018
+003019
+004003
+004005
+004006
+004008
+004010
+004012
+004014
+004016
+004017
+004020
+004021
+004022
+004023
+004025
+004026
+006004
+006006
+006010
+006011
+006012
+006014
+007001
+007002
+007003
+007005
+007007
+007008
+007009
+007011
+007012
+007013
+007015
+007016
+007017
+007018
+007019
+007020
+007021
+007022
+007023
+007025
+007027
+007029
+007031
+007032
+007034
+007036
+007037
+007038
+007040
+007043
+009001
+009002
+009004
+009005
+009006
+009007
+009008
+009010
+009011
+009012
+009013
+010002
+010003
+010004
+010005
+010006
+010007
+010008
+010009
+010010
+010011
+010012
+010013
+010015
+010016
+010017
+010018
+010019
+010020
+010021
+010022
+010023
+010026
+010027
+010028
+011001
+011002
+011003
+011004
+011006
+011012
+011013
+011014
+011015
+011016
+012017
+012027
+012032
+012034
+012036
+012037
+012038
+012039
+014001
+016016
+016019
+016020
+016021
+016022
+016023
+016024
+016026
+016028
+016029
+016030
+016031
+016032
+016033
+016034
+017002
+018001
+019002
+019004
+020001
+020004
+020006
+020008
+020009
+022001
+022002
+022003
+023001
+023002
+023003
+023004
+023005
+023006
+023007
+023010
+023011
+023017
+023019
+023020
+023025
+023026
+023027
+023028
+023029
+023030
+023032
+023033
+023034
+023035
+025001
+025003
+025004
+025005
+025007
+025008
+025009
+025010
+025011
+025012
+025013
+025014
+025015
+025016
+025018
+025019
+025020
+025021
+025022
+025023
+025024
+025025
+025026
+025027
+025028
+025030
+025031
+025033
+025034
+025035
+025037
+025041
+025042
+025043
+025046
+025048
+025049
+025050
+025051
+025052
+025053
+025054
+025055
+025056
+025057
+025058
+025060
+025061
+025062
+025063
+027001
+027002
+027011
+036001
+037003
+037006
+037007
+037008
+038009
+039001
+039002
+039003
+039004
+039005
+039006
+046001
+046002
+046003
+046005
+046007
+046008
+046009
+046010
+046012
+046013
+046014
+047001
+047002
+048001
+051003
+051004
+052001
+052002
+052005
+053016
+053019
+053023
+053024
+053026
+053028
+053029
+053033
+053045
+053046
+053051
+053054
+053057
+053069
+053097
+053107
+053125
+053127
+054001
+054002
+054003
+054004
+054006
+054007
+054009
+054010
+056001
+056002
+056003
+056004
+056005
+056006
+056009
+056011
+056016
+056017
+056018
+056019
+056020
+056022
+057003
+057004
+058002
+058003
+058004
+058005
+060001
+060004
+060005
+060007
+061004
+061006
+069006
+069007
+069010
+069011
+069012
+069013
+069014
+069015
+069016
+069018
+069020
+069021
+069023
+071002
+071003
+071004
+071005
+071006
+071008
+071011
+071020
+071021
+071022
+072001
+074001
+074002
+074003
+074004
+074005
+074006
+074007
+074008
+074009
+074010
+074011
+074012
+075001
+075007
+076101
+076102
+076103
+077001
+077002
+077003
+077004
+077006
+077008
+077009
+078005
+079002
+079003
+079004
+079005
+079006
+079007
+081001
+082011
+082013
+082014
+082015
+082016
+082017
+082021
+082022
+082023
+082024
+082025
+082026
+082027
+082028
+082029
+082030
+082031
+082032
+082033
+082034
+082035
+082036
+082037
+082038
+082039
+082040
+082041
+082042
+082043
+082044
+084001
+084002
+084003
+084004
+084005
+084007
+084008
+084009
+084011
+084013
+084014
+084016
+084017
+084027
+084032
+084033
+084035
+084036
+084037
+084038
+084039
+084040
+084041
+084042
+084043
+084044
+084045
+084046
+084047
+084048
+084049
+084050
+084051
+085001
+085002
+085003
+085004
+085005
+085006
+085007
+085009
+085011
+085012
+085014
+085015
+085016
+085017
+085018
+085019
+085020
+085022
+085023
+085028
+085029
+085030
+085031
+085033
+085034
+085035
+085036
+085037
+085038
+085040
+085041
+085042
+085043
+085044
+085045
+085046
+085047
+085048
+085063
+085064
+085065
+085068
+085071
+085073
+085082
+085086
+085088
+085089
+085090
+085091
+085092
+085093
+085095
+085096
+085097
+085098
+085099
+085100
+085101
+085102
+085103
+085104
+085105
+085106
+085108
+085109
+085110
+085111
+085112
+085113
+085115
+085120
+085121
+085122
+085123
+085125
+085126
+085127
+085128
+085129
+085130
+085132
+085133
+085134
+085135
+085136
+085137
+086002
+086003
+086005
+088001
+088003
+088005
+088006
+088007
+088008
+088009
+089001
+090001
+090002
+090003
+090004
+090006
+090008
+090009
+090010
+090013
+090016
+090017
+090018
+090022
+090027
+091001
+091002
+091009
+091011
+091012
+091013
+091015
+091016
+091017
+091018
+093003
+099001
+100001
+106001
+113005
+113006
+113018
+113019
+113020
+115001
+115002
+115003
+115004
+115005
+115006
+115007
+115008
+115009
+115010
+115011
+115012
+115013
+115014
+115015
+115016
+115017
+115018
+115020
+115021
+115022
+115023
+115025
+115026
+115027
+115028
+115029
+115030
+115031
+115032
+115033
+115034
+115035
+115036
+115039
+115040
+115041
+115042
+115043
+115044
+115046
+115047
+115048
+115050
+115051
+115052
+115053
+115054
+115055
+115057
+115059
+115060
+115061
+115062
+115064
+115065
+115066
+115067
+115068
+115069
+115070
+115071
+115072
+115073
+115075
+115076
+115081
+115082
+115085
+115086
+115087
+115088
+115095
+115096
+115097
+115098
+115099
+115101
+115102
+115103
+115104
+115105
+115106
+115108
+115109
+115111
+115112
+115113
+115114
+115115
+115116
+115117
+115118
+115119
+115120
+115121
+115122
+116001
+116003
+116004
+116005
+116006
+116007
+116008
+116009
+116010
+116011
+116012
+123001
+124065
+126001
+126002
+126003
+126004
+126005
+126006
+126007
+126008
+126009
+126010
+126011
+126012
+130001
+132001
+132002
+133001
+133008
+133009
+133010
+133011
+133012
+133015
+133016
+133018
+133019
+133021
+133022
+133023
+133024
+133025
+133027
+133028
+133029
+133030
+133031
+134001
+135001
+135002
+135004
+135010
+137010
+137011
+137012
+137014
+137015
+137016
+137019
+139001
+140001
+141001
+141002
+141003
+141006
+141007
+141009
+141011
+141012
+141014
+141015
+141016
+141017
+141018
+141019
+141020
+141021
+141022
+141023
+141024
+141025
+141026
+141027
+141028
+145001
+145002
+145003
+145004
+145005
+145006
+145008
+145009
+145011
+145012
+145013
+150009
+150013
+150014
+150015
+150016
+150017
+150020
+152001
+152002
+152003
+152004
+152005
+152006
+152007
+154001
+154002
+155001
+155002
+155003
+155004
+155006
+159001
+159003
+160001
+160002
+161001
+162002
+162003
+162007
+162012
+163001
+163011
+163015
+163016
+165001
+165002
+165003
+165004
+165005
+165006
+165007
+165008
+165009
+165010
+165011
+165012
+165013
+165014
+165015
+165016
+165017
+165018
+165019
+165020
+165021
+165022
+165023
+165024
+165025
+165026
+165028
+165029
+165030
+165031
+165033
+165034
+165035
+165036
+168003
+168004
+168005
+168014
+169001
+169002
+169003
+169007
+169008
+169009
+169010
+171006
+171007
+171008
+171009
+172001
+176001
+176002
+176003
+177001
+179007
+179012
+179013
+179042
+179044
+179045
+180001
+180013
+180014
+180015
+180017
+180018
+180020
+180021
+180027
+180030
+180033
+180035
+180036
+180037
+180038
+180041
+180042
+180045
+180047
+180048
+180049
+180050
+180054
+180060
+180066
+180067
+180068
+180070
+182001
+184001
+184002
+184005
+184006
+184008
+184009
+184010
+184011
+185001
+185003
+187001
+191002
+192002
+194003
+197001
+197002
+197003
+197004
+197005
+197006
+198001
+198003
+198004
+198005
+198006
+198007
+198008
+198009
+198010
+198011
+198012
+198015
+198016
+198017
+201001
+201002
+202001
+203001
+203002
+203003
+203017
+203018
+203019
+204001
+204002
+205001
+208001
+208002
+208003
+208004
+208005
+209001
+209002
+209003
+210001
+210004
+210009
+210010
+212001
+212002
+212003
+212004
+212005
+212006
+212007
+212008
+212009
+212010
+212011
+212012
+212013
+218001
+218004
+218009
+218011
+218015
+218020
+218021
+218022
+218023
+218024
+218025
+218026
+218027
+218028
+218029
+218030
+218031
+221001
+221002
+221003
+221004
+221005
+221006
+221007
+221008
+221009
+221010
+221011
+221012
+221013
+223003
+224001
+224002
+224003
+224007
+224008
+225001
+225002
+225003
+225004
+225005
+225006
+225007
+225008
+225009
+225010
+225011
+225012
+225013
+226001
+226002
+226003
+226005
+226006
+226007
+227011
+227015
+227041
+227045
+227052
+227056
+227063
+227064
+227066
+227067
+227069
+227071
+227073
+227085
+227116
+227119
+227131
+227133
+227147
+229005
+233003
+233004
+235001
+235002
+235003
+235004
+235005
+236001
+236002
+236003
+238002
+238003
+238004
+238005
+238007
+238008
+334005
+334006
+337001
+337002
+337003
+337004
+343001
+344001
+344002
+344003
+344004
+344005
+345001
+348001
+348004
+348005
+349001
+349002
+350001
+353002
+353003
+355001
+355002
+355005
+355006
+356001
+358001
+359001
+359002
+360001
+360002
+360003
+360004
+360005
+366001
+366002
+366003
+366004
+369001
+373001
+373002
+373003
+373005
+373007
+373008
+373009
+373010
+373011
+373012
+373013
+373014
+373015
+373017
+373018
+373021
+374002
+374004
+374006
+374007
+374008
+374009
+374010
+374011
+374012
+374015
+374016
+382001
+382002
+384001
+386001
+386002
+386003
+386004
+386005
+386006
+386007
+386008
+386009
+386010
+386011
+386012
+386013
+386014
+389001
+389002
+389003
+389004
+392001
+393001
+393002
+393003
+393004
+395001
+397001
+397002
+399001
+399002
+399003
+400001
+400002
+403002
+504001
+504002
+504004
+504005
+504006
+504007
+504008
+504009
+504010
+504011
+504012
+504014
+504017
+504021
+504022
+504023
+504024
+504025
+506001
+506002
+511001
+511002
+511003
+511004
+511005
+511006
+511007
+511008
+511009
+511010
+511011
+511012
+511013
+511014
+511017
+511018
+511020
+511021
+511022
+511024
+511028
+511029
+513001
+513002
+513003
+513004
+515001
+515002
+515003
+515007
+515008
+515011
+515012
+515013
+515014
+515015
+518001
+518002
+521001
+521002
+521003
+521004
+521005
+521006
+521009
+521010
+521011
+521012
+521013
+521015
+521016
+523001
+523002
+523003
+523004
+523005
+523006
+523007
+524001
+700001
+701001
+701002
+701003
+702001
+702002
+702004
+702005
+704001
+704004
+705001
+706001
+706002
+707001
+707002
+707003
+708001
+710001
+710002
+711001
+711002
+712001
+714001
+714002
+715001
+719001
+719002
+991002
+991003
+991004
+991005
+991006
+991007
+995001
+996001
+996002
+996003
+998001
+998002
+998003
+998004
+998005
+998006
+998007
+999001
+999002
+011017
+011018
+034001
+034002
+071010
+519001
+126013
+184012
+404001
+405002
+405001
+405003
+405006
+240011
+240010
+240009
+240008
+240007
+240005
+240004
+240003
+240002
+240001
+240012
+240013
+240014
+240015
+240016
+240017
+357001
+235006
+235007
+056023
+046015
+019005
+126014
+241003
+241002
+241001
+240020
+240019
+242001
+242002
+242004
+242005
+242006
+089002
+406001
+406002
+406003
+406004
+243001
+243005
+243006
+243007
+243008
+408001
+366005
+016035
+077010
+996004
+025064
+011019
+115123
+504026
+039007
+039009
+039008
+039010
+039011
+039012
+180072
+240021
+240023
+405008
+525002
+410002
+410004
+410005
+410006
+410007
+410008
+410009
+410010
+410011
+410012
+410013
+410014
+410016
+344006
+240031
+240030
+240029
+240028
+240027
+240026
+240025
+240024
+240034
+240033
+240032
+411001
+411002
+203020
+069025
+244001
+244002
+244009
+244008
+244007
+244006
+244004
+244003
+244014
+244013
+244012
+244011
+244016
+244017
+240040
+240037
+405009
+405010
+240043
+504028
+504040
+800001
+410019
+410020
+410021
+244018
+244019
+244020
+413001
+344007
+082045
+010031
+010032
+010033
+010034
+010035
+504044
+515016
+801002
+801003
+801004
+801005
+802001
+801001
+414001
+141029
+803001
+803002
+803004
+803005
+803006
+803007
+803008
+803009
+803013
+803014
+803015
+803016
+803017
+410022
+410023
+803019
+415002
+415001
+244021
+011020
+011023
+011022
+011021
+025065
+165037
+165038
+165039
+416001
+416002
+416003
+417001
+418001
+504045
+803022
+240022
+420001
+804010
+804005
+804002
+804018
+804013
+511019
+511016
+511015
+511032
+511031
+511030
+511027
+511026
+511025
+511033
+511023
+133034
+133033
+169011
+344008
+244022
+244026
+244025
+244030
+244023
+244024
+244027
+244028
+244029
+244031
+082046
+082047
+082048
+126015
+126016
+416005
+421001
+421002
+016037
+016036
+115124
+115126
+240049
+240048
+240047
+240046
+240045
+240044
+244032
+244033
+422002
+422004
+422005
+184013
+805001
+805002
+805003
+805004
+805005
+056024
+423001
+344010
+235009
+212014
+056025
+056026
+244034
+244035
+244036
+244037
+244038
+244039
+203015
+245002
+245001
+056029
+056030
+056032
+424001
+056034
+056033
+805006
+805007
+805008
+805009
+805010
+422008
+422007
+422006
+422010
+422009
+422011
+209004
+150022
+100002
+056035
+023036
+185005
+246001
+247001
+247002
+425001
+416006
+165042
+165041
+165040
+165043
+010040
+010039
+010038
+010036
+248001
+248002
+248003
+248004
+248005
+249001
+249003
+249004
+249005
+250007
+250001
+250002
+250003
+250004
+250005
+250006
+250008
+250009
+250010
+250011
+250012
+250013
+251001
+251002
+806001
+806002
+235010
+243009
+249007
+249008
+249009
+011024
+011025
+429001
+429002
+429003
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
new file mode 100644
index 00000000000..93a38e9967f
--- /dev/null
+++ b/mysql-test/r/type_float.result
@@ -0,0 +1,66 @@
+10 10.0 10. .1e+2 100.0e-1
+10 10.0 10 10 10
+6e-05 -6e-05 --6e-05 -6e-05+1.000000
+6e-05 -6e-05 6e-05 0.99994
+Field Type Null Key Default Extra Privileges
+f1 float YES NULL select,insert,update,references
+f2 double YES NULL select,insert,update,references
+f1 f2
+10 10
+100000 100000
+1.23457e+09 1234567890
+1e+10 10000000000
+1e+15 1e+15
+1e+20 1e+20
+3.40282e+38 1e+50
+3.40282e+38 1e+150
+-10 -10
+1e-05 1e-05
+1e-10 1e-10
+1e-15 1e-15
+1e-20 1e-20
+0 1e-50
+0 1e-150
+datum
+0.5
+1
+1.5
+2
+2.5
+datum
+0.5
+1
+datum
+2
+2.5
+datum
+1.5
+a
+-0.010
+-0.002
+-0.000
+0.000
+1.000
+min(a)
+-0.010
+Field Type Null Key Default Extra Privileges
+f float YES NULL select,insert,update,references
+f2 float YES NULL select,insert,update,references
+f3 float(6,2) YES NULL select,insert,update,references
+d double YES NULL select,insert,update,references
+d2 double YES NULL select,insert,update,references
+d3 double(10,3) YES NULL select,insert,update,references
+de decimal(10,0) YES NULL select,insert,update,references
+de2 decimal(6,0) YES NULL select,insert,update,references
+de3 decimal(5,2) YES NULL select,insert,update,references
+n decimal(10,0) YES NULL select,insert,update,references
+n2 decimal(8,0) YES NULL select,insert,update,references
+n3 decimal(8,6) YES NULL select,insert,update,references
+a
+-0.010
+-0.002
+-0.000
+0.000
+1.000
+min(a)
+-0.010
diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result
new file mode 100644
index 00000000000..abb8ef8cb09
--- /dev/null
+++ b/mysql-test/r/type_ranges.result
@@ -0,0 +1,159 @@
+Field Type Null Key Default Extra Privileges
+auto int(5) unsigned PRI NULL auto_increment select,insert,update,references
+string varchar(10) YES hello select,insert,update,references
+tiny tinyint(4) MUL 0 select,insert,update,references
+short smallint(6) MUL 1 select,insert,update,references
+medium mediumint(8) MUL 0 select,insert,update,references
+long_int int(11) 0 select,insert,update,references
+longlong bigint(13) MUL 0 select,insert,update,references
+real_float float(13,1) MUL 0.0 select,insert,update,references
+real_double double(16,4) YES NULL select,insert,update,references
+utiny tinyint(3) unsigned MUL 0 select,insert,update,references
+ushort smallint(5) unsigned zerofill MUL 00000 select,insert,update,references
+umedium mediumint(8) unsigned MUL 0 select,insert,update,references
+ulong int(11) unsigned MUL 0 select,insert,update,references
+ulonglong bigint(13) unsigned MUL 0 select,insert,update,references
+time_stamp timestamp(14) YES NULL select,insert,update,references
+date_field date YES NULL select,insert,update,references
+time_field time YES NULL select,insert,update,references
+date_time datetime YES NULL select,insert,update,references
+blob_col blob YES NULL select,insert,update,references
+tinyblob_col tinyblob YES NULL select,insert,update,references
+mediumblob_col mediumblob select,insert,update,references
+longblob_col longblob select,insert,update,references
+options enum('one','two','tree') MUL one select,insert,update,references
+flags set('one','two','tree') select,insert,update,references
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
+t1 0 PRIMARY 1 auto A 0 NULL NULL
+t1 1 utiny 1 utiny A NULL NULL NULL
+t1 1 tiny 1 tiny A NULL NULL NULL
+t1 1 short 1 short A NULL NULL NULL
+t1 1 any_name 1 medium A NULL NULL NULL
+t1 1 longlong 1 longlong A NULL NULL NULL
+t1 1 real_float 1 real_float A NULL NULL NULL
+t1 1 ushort 1 ushort A NULL NULL NULL
+t1 1 umedium 1 umedium A NULL NULL NULL
+t1 1 ulong 1 ulong A NULL NULL NULL
+t1 1 ulonglong 1 ulonglong A NULL NULL NULL
+t1 1 ulonglong 2 ulong A NULL NULL NULL
+t1 1 options 1 options A NULL NULL NULL
+t1 1 options 2 flags A NULL NULL NULL
+auto string tiny short medium long_int longlong real_float real_double utiny ushort umedium ulong ulonglong mod(floor(time_stamp/1000000),1000000)-mod(curdate(),1000000) date_field time_field date_time blob_col tinyblob_col mediumblob_col longblob_col
+10 1 1 1 1 1 1 1.0 1.0000 1 00001 1 1 1 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 1 1 1
+11 2 2 2 2 2 2 2.0 2.0000 2 00002 2 2 2 0 NULL NULL NULL NULL NULL 2 2
+12 0.33 3 3 3 3 3 3.0 3.0000 3 00003 3 3 3 0 1997-03-03 10:10:10 1997-03-03 10:10:10 3
+13 -1 -1 -1 -1 -1 -1 -1.0 -1.0000 0 00000 0 0 18446744073709551615 0 1997-08-07 08:07:06 1997-04-03 09:08:07 -1 -1 -1 -1
+14 -429496729 -128 -32768 -8388608 -2147483648 -4294967295 -4294967296.0 -4294967295.0000 0 00000 0 0 18446744069414584321 0 0000-00-00 00:00:00 0000-00-00 00:00:00 -4294967295 -4294967295 -4294967295 -4294967295
+15 4294967295 127 32767 8388607 2147483647 4294967295 4294967296.0 4294967295.0000 255 65535 16777215 4294967295 4294967295 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4294967295 4294967295 4294967295 4294967295
+16 hello 1 1 0 0 0 0.0 NULL 0 00000 0 0 0 0 NULL NULL NULL NULL NULL
+auto new_field new_blob_col date_field
+10 new 1 0000-00-00
+11 new NULL NULL
+12 new 1997-03-03
+13 new -1 1997-08-07
+14 new -4294967295 0000-00-00
+15 new 4294967295 0000-00-00
+16 new NULL NULL
+auto string mediumblob_col new_field
+1 2 2 ne
+2 0.33 ne
+3 -1 -1 ne
+4 -429496729 -4294967295 ne
+5 4294967295 4294967295 ne
+6 hello ne
+flags
+
+one,two,tree
+one
+one,two
+flags
+one,two,tree
+one,two,tree
+one,two
+one,two
+flags
+options flags
+one one
+options flags
+one one
+Field Type Null Key Default Extra Privileges
+auto int(5) unsigned MUL NULL auto_increment select,insert,update,references
+string varchar(10) YES new defaul select,insert,update,references
+tiny tinyint(4) MUL 0 select,insert,update,references
+short smallint(6) MUL 0 select,insert,update,references
+medium mediumint(8) MUL 0 select,insert,update,references
+long_int int(11) 0 select,insert,update,references
+longlong bigint(13) MUL 0 select,insert,update,references
+real_float float(13,1) MUL 0.0 select,insert,update,references
+real_double double(16,4) YES NULL select,insert,update,references
+utiny tinyint(3) unsigned 0 select,insert,update,references
+ushort smallint(5) unsigned zerofill 00000 select,insert,update,references
+umedium mediumint(8) unsigned MUL 0 select,insert,update,references
+ulong int(11) unsigned MUL 0 select,insert,update,references
+ulonglong bigint(13) unsigned MUL 0 select,insert,update,references
+time_stamp timestamp(14) YES NULL select,insert,update,references
+date_field varchar(10) YES NULL select,insert,update,references
+time_field time YES NULL select,insert,update,references
+date_time datetime YES NULL select,insert,update,references
+new_blob_col varchar(20) YES NULL select,insert,update,references
+tinyblob_col tinyblob YES NULL select,insert,update,references
+mediumblob_col mediumblob select,insert,update,references
+options enum('one','two','tree') MUL one select,insert,update,references
+flags set('one','two','tree') select,insert,update,references
+new_field varchar(10) new select,insert,update,references
+Field Type Null Key Default Extra Privileges
+auto int(5) unsigned 0 select,insert,update,references
+string varchar(10) YES new defaul select,insert,update,references
+tiny tinyint(4) 0 select,insert,update,references
+short smallint(6) 0 select,insert,update,references
+medium mediumint(8) 0 select,insert,update,references
+long_int int(11) 0 select,insert,update,references
+longlong bigint(13) 0 select,insert,update,references
+real_float float(13,1) 0.0 select,insert,update,references
+real_double double(16,4) YES NULL select,insert,update,references
+utiny tinyint(3) unsigned 0 select,insert,update,references
+ushort smallint(5) unsigned zerofill 00000 select,insert,update,references
+umedium mediumint(8) unsigned 0 select,insert,update,references
+ulong int(11) unsigned 0 select,insert,update,references
+ulonglong bigint(13) unsigned 0 select,insert,update,references
+time_stamp timestamp(14) YES NULL select,insert,update,references
+date_field varchar(10) YES NULL select,insert,update,references
+time_field time YES NULL select,insert,update,references
+date_time datetime YES NULL select,insert,update,references
+new_blob_col varchar(20) YES NULL select,insert,update,references
+tinyblob_col tinyblob YES NULL select,insert,update,references
+mediumblob_col mediumblob select,insert,update,references
+options enum('one','two','tree') one select,insert,update,references
+flags set('one','two','tree') select,insert,update,references
+new_field varchar(10) new select,insert,update,references
+auto auto
+16 16
+auto auto
+16 16
+Field Type Null Key Default Extra Privileges
+auto bigint(17) PRI 0 select,insert,update,references
+t1 bigint(1) 0 select,insert,update,references
+t2 char(1) select,insert,update,references
+t3 mediumtext select,insert,update,references
+t4 mediumblob select,insert,update,references
+auto t1 t2 t3 t4
+11 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+12 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+13 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+14 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+15 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+16 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+17 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+Field Type Null Key Default Extra Privileges
+c1 int(11) YES NULL select,insert,update,references
+c2 int(11) YES NULL select,insert,update,references
+const bigint(1) 0 select,insert,update,references
+id_A id_B
+1 1
+2 NULL
+id_A id_B
+1 1
+2 NULL
+id_A id_B
+1 1
+2 NULL
diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result
new file mode 100644
index 00000000000..1a137a89b1e
--- /dev/null
+++ b/mysql-test/r/type_time.result
@@ -0,0 +1,68 @@
+t
+10:22:33
+12:34:56
+00:00:10
+00:12:34
+12:34:56
+123:45:59
+00:00:01
+01:23:00
+01:23:45
+00:00:10
+-241:22:33
+490:22:33
+20:33:34
+00:00:30
+00:12:30
+00:12:30
+12:30:00
+12:30:35
+36:30:31
+t
+10:22:33
+12:34:56
+00:00:10
+00:12:34
+12:34:56
+123:45:59
+00:00:01
+01:23:00
+01:23:45
+00:00:10
+-241:22:33
+490:22:33
+20:33:34
+00:00:30
+00:12:30
+00:12:30
+12:30:00
+12:30:35
+36:30:31
+00:00:10
+00:00:00
+838:59:59
+838:59:59
+262:22:00
+00:00:12
+t time_to_sec(t) sec_to_time(time_to_sec(t))
+09:00:00 32400 09:00:00
+13:00:00 46800 13:00:00
+19:38:34 70714 19:38:34
+13:00:00 46800 13:00:00
+09:00:00 32400 09:00:00
+09:00:00 32400 09:00:00
+13:00:00 46800 13:00:00
+13:00:00 46800 13:00:00
+13:00:00 46800 13:00:00
+09:00:00 32400 09:00:00
+sec_to_time(time_to_sec(t))
+09:00:00
+13:00:00
+19:38:34
+13:00:00
+09:00:00
+09:00:00
+13:00:00
+13:00:00
+13:00:00
+09:00:00
diff --git a/mysql-test/r/type_timestamp.result b/mysql-test/r/type_timestamp.result
new file mode 100644
index 00000000000..8dcf99ebcd1
--- /dev/null
+++ b/mysql-test/r/type_timestamp.result
@@ -0,0 +1,2 @@
+t
+19700101022034
diff --git a/mysql-test/r/type_uint.result b/mysql-test/r/type_uint.result
new file mode 100644
index 00000000000..54fa717e0f8
--- /dev/null
+++ b/mysql-test/r/type_uint.result
@@ -0,0 +1,3 @@
+this
+1
+0
diff --git a/mysql-test/r/type_year.result b/mysql-test/r/type_year.result
new file mode 100644
index 00000000000..7dc15a4dd1b
--- /dev/null
+++ b/mysql-test/r/type_year.result
@@ -0,0 +1,21 @@
+y y2
+0000 00
+1999 99
+2000 00
+2001 01
+1970 70
+2069 69
+y y2
+0000 00
+1970 70
+1999 99
+2000 00
+2001 01
+2069 69
+y y2
+1970 70
+1999 99
+0000 00
+2000 00
+2001 01
+2069 69
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
new file mode 100644
index 00000000000..9aa47a089a6
--- /dev/null
+++ b/mysql-test/r/update.result
@@ -0,0 +1,2 @@
+place_id shows
+1 1
diff --git a/mysql-test/r/varbinary.result b/mysql-test/r/varbinary.result
new file mode 100644
index 00000000000..62aeae21970
--- /dev/null
+++ b/mysql-test/r/varbinary.result
@@ -0,0 +1,6 @@
+0x41 0x41+0 0x41 | 0x7fffffffffffffff | 0 0xffffffffffffffff | 0
+A 65 9223372036854775807 -1
+0x31+1 concat(0x31)+1 -0xf
+50 2 -15
+table type possible_keys key key_len ref rows Extra
+t1 const UNIQ UNIQ 8 const 1
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
new file mode 100644
index 00000000000..ee04e437bb7
--- /dev/null
+++ b/mysql-test/r/variables.result
@@ -0,0 +1,12 @@
+@test @`select` @TEST @not_used
+1 2 3 NULL
+@test_int @test_double @test_string @test_string2 @select
+10 0.00 abcdeghi abcdefghij NULL
+@test_int @test_double @test_string @test_string2
+hello hello hello hello
+@test_int @test_double @test_string @test_string2
+hellohello hellohello hellohello hellohello
+@test_int @test_double @test_string @test_string2
+NULL NULL NULL NULL
+@t1:=(@t2:=1)+@t3:=4 @t1 @t2 @t3
+5 5 1 4