diff options
| author | unknown <igor@rurik.mysql.com> | 2004-10-09 10:34:13 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-10-09 10:34:13 -0700 |
| commit | 881534fb80cc7a017d180734a21a10b3e46aecba (patch) | |
| tree | 84324c7af32f54d423310e3a2ee3255f7f43749b /mysql-test/r/func_group.result | |
| parent | 79f1eeb87ff8047d1d09578f41c604bf5e31f29b (diff) | |
| parent | 75fec5bdc3e9e5f0a4018c7dbf6371f0b4c5d14f (diff) | |
| download | mariadb-git-881534fb80cc7a017d180734a21a10b3e46aecba.tar.gz | |
Merge for Item_equal.
BitKeeper/etc/ignore:
auto-union
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_row.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_list.h:
Auto merged
mysql-test/r/func_test.result:
Post-automerge resolution of conflicts
mysql-test/r/index_merge.result:
Post-automerge resolution of conflicts
mysql-test/r/join_outer.result:
Post-automerge resolution of conflicts
mysql-test/r/range.result:
Post-automerge resolution of conflicts
mysql-test/r/subselect.result:
Post-automerge resolution of conflicts
sql/item.cc:
Post-automerge resolution of conflicts
sql/item.h:
Post-automerge resolution of conflicts
sql/item_cmpfunc.cc:
Post-automerge resolution of conflicts
sql/item_cmpfunc.h:
Post-automerge resolution of conflicts
sql/opt_range.cc:
Post-automerge resolution of conflicts
sql/sql_select.cc:
Post-automerge resolution of conflicts
sql/sql_select.h:
Post-automerge resolution of conflicts
Diffstat (limited to 'mysql-test/r/func_group.result')
| -rw-r--r-- | mysql-test/r/func_group.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index 9af8fa8c8cc..acc3205a63a 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -476,7 +476,7 @@ CHI Los Angeles explain select max(a3) from t1 where a2 is null and a2 = 2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE select max(a3) from t1 where a2 is null and a2 = 2; max(a3) NULL |