diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-11 19:54:31 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-11 19:54:31 -0600 |
| commit | 2aed7cf90ef69ad58588cd8296176bad20b9dd04 (patch) | |
| tree | 9bf257a90e55b757a97fdd2fbc4149e054718451 /mysql-test/r | |
| parent | c9dbb4b72640ecfc063f06f9373ac42ef3d9775f (diff) | |
| download | mariadb-git-2aed7cf90ef69ad58588cd8296176bad20b9dd04.tar.gz | |
post-merge fixes to make it compile. It still fails the fulltext test,
(wrong error code) but I'll push it so that Sergei could clean up
my merge
include/mysqld_error.h:
fixed typo
mysql-test/r/order_by.result:
updated result for merged test
sql/Makefile.am:
put back sql_union.cc lost during merge
sql/mysql_priv.h:
restored variables lost in the merge
sql/mysqld.cc:
put back lost variable declarations
sql/share/czech/errmsg.txt:
merge fix
sql/share/danish/errmsg.txt:
merge fix
sql/share/dutch/errmsg.txt:
merge fix
sql/share/english/errmsg.txt:
merge fix
sql/share/estonian/errmsg.txt:
merge fix
sql/share/french/errmsg.txt:
merge fix
sql/share/german/errmsg.txt:
merge fix
sql/share/greek/errmsg.txt:
merge fix
sql/share/hungarian/errmsg.txt:
merge fix
sql/share/italian/errmsg.txt:
merge fix
sql/share/japanese/errmsg.txt:
merge fix
sql/share/korean/errmsg.txt:
merge fix
sql/share/norwegian-ny/errmsg.txt:
merge fix
sql/share/norwegian/errmsg.txt:
merge fix
sql/share/polish/errmsg.txt:
merge fix
sql/share/portuguese/errmsg.txt:
merge fix
sql/share/romanian/errmsg.txt:
merge fix
sql/share/russian/errmsg.txt:
merge fix
sql/share/slovak/errmsg.txt:
merge fix
sql/share/spanish/errmsg.txt:
merge fix
sql/share/swedish/errmsg.txt:
merge fix
sql/sql_acl.cc:
merge fix
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/order_by.result | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index 79b70ac2cc9..f6fc3b6090a 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -111,31 +111,6 @@ DateOfAction TransactionID member_id nickname voornaam 1 2 -gid sid uid -104620 5 15 -103867 5 27 -103962 5 27 -104619 5 75 -104505 5 117 -103853 5 250 -gid sid uid -104620 5 15 -103867 5 27 -103962 5 27 -104619 5 75 -104505 5 117 -103853 5 250 -table type possible_keys key key_len ref rows Extra -t1 index PRIMARY PRIMARY 4 NULL 6 Using index -t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1 -t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 where used; Using index -table type possible_keys key key_len ref rows Extra -t1 index PRIMARY PRIMARY 4 NULL 6 Using index -t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 where used -table type possible_keys key key_len ref rows Extra -t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort -t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1 -t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 where used; Using index table type possible_keys key key_len ref rows Extra t1 range a a 20 NULL 2 where used; Using index a b c @@ -252,3 +227,34 @@ a b c 1 1 1 0 b 1 0 +gid sid uid +104620 5 15 +103867 5 27 +103962 5 27 +104619 5 75 +104505 5 117 +103853 5 250 +gid sid uid +104620 5 15 +103867 5 27 +103962 5 27 +104619 5 75 +104505 5 117 +103853 5 250 +table type possible_keys key key_len ref rows Extra +t1 index PRIMARY PRIMARY 4 NULL 6 Using index +t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1 +t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 where used; Using index +table type possible_keys key key_len ref rows Extra +t1 index PRIMARY PRIMARY 4 NULL 6 Using index +t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 where used +table type possible_keys key key_len ref rows Extra +t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort +t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1 +t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 where used; Using index +table type possible_keys key key_len ref rows Extra +t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort +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 |