summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-07-01 13:09:24 +0300
committerunknown <monty@mashka.mysql.fi>2003-07-01 13:09:24 +0300
commit1726ae86be52bc129b5788406d60808b15b8bd9f (patch)
tree70fbaea028f6bbf6ba895a7dfb5eca914c106904 /mysql-test/r
parentf6d3f0790c953eb1b72e1468d290ece66aeb9940 (diff)
parentcaddb5ea53cbde18bf0a915bc4867fecd93c55d5 (diff)
downloadmariadb-git-1726ae86be52bc129b5788406d60808b15b8bd9f.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/order_by.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
index 1a292b1203c..d45ae6b6dec 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -142,3 +142,7 @@ t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 where used
table type possible_keys key key_len ref rows Extra
t1 ALL NULL NULL NULL NULL 6 Using temporary; Using filesort
t3 eq_ref PRIMARY PRIMARY 2 t1.skr 1 where used
+t2_id str
+112633 t2 112633
+112634 t2 112634
+t2_id str