diff options
author | unknown <mskold@mysql.com> | 2005-08-01 11:52:07 +0200 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2005-08-01 11:52:07 +0200 |
commit | 15ea9263b16e64d26d6ffcf1d381a77402fe17a2 (patch) | |
tree | 723201633574926a3a3ba42b3ca5a0e332accb55 /mysql-test/r | |
parent | 7478e9df63275395fb7c932f25b474cf229dc874 (diff) | |
parent | 35fd6415062743163b8a0e81e7f6a515c0f2bc93 (diff) | |
download | mariadb-git-15ea9263b16e64d26d6ffcf1d381a77402fe17a2.tar.gz |
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-release
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/ndb_condition_pushdown.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_condition_pushdown.result b/mysql-test/r/ndb_condition_pushdown.result index 14cd4666528..1c3da1b486f 100644 --- a/mysql-test/r/ndb_condition_pushdown.result +++ b/mysql-test/r/ndb_condition_pushdown.result @@ -1514,7 +1514,7 @@ select auto from t1 where '1901-01-01 01:01:01' in(date_time) order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ref medium_index medium_index 3 const 10 Using where with pushed condition; Using filesort select auto from t1 where "aaaa" in(string) and "aaaa" in(vstring) and |