summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/key_diff.result6
-rw-r--r--mysql-test/r/type_blob.result6
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/key_diff.result b/mysql-test/r/key_diff.result
index 5668bb01eba..ab5b9bcc0e7 100644
--- a/mysql-test/r/key_diff.result
+++ b/mysql-test/r/key_diff.result
@@ -28,12 +28,12 @@ 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 B b A
+C c C c
a a a a
+a a b A
b A A B
-C c C c
a b
A B
a a
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index 3190c3a29e6..dcc31addc47 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -242,11 +242,11 @@ 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
+_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) replace(min(t3._field_140), "\r","^M") 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 test job 1 0000-00-00 00:00:00 1999-02-25 22:43:32 0 High admin 0 tomato test^M
+job^M
1 1
stamp
19990402000000