diff options
| author | unknown <sergefp@mysql.com> | 2005-09-09 11:50:38 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-09-09 11:50:38 +0400 |
| commit | 0ef988ada34636dee1af7c802f96b136eb7cc936 (patch) | |
| tree | ed5fe2f19c4151b1a4c3348f06b5a96237c24dc3 /mysql-test/r/olap.result | |
| parent | 5ed7e97310c2c5e8f7ec50bf0e15fb01cce53407 (diff) | |
| parent | f32088a94188f5baf4acea10067643d9352c6d23 (diff) | |
| download | mariadb-git-0ef988ada34636dee1af7c802f96b136eb7cc936.tar.gz | |
Post-merge fixes
client/mysqlimport.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/t/connect.test:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/olap.result')
| -rw-r--r-- | mysql-test/r/olap.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index df0ee09ea8e..73dd3fc8aa2 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -579,7 +579,6 @@ a LENGTH(a) COUNT(*) 1 1 1 2 1 1 NULL NULL 2 -DROP TABLE t1; CREATE TABLE t1(id int, type char(1)); INSERT INTO t1 VALUES (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"), |