summaryrefslogtreecommitdiff
path: root/mysql-test/r/bdb.result
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-05-10 15:06:35 -0600
committerunknown <sasha@mysql.sashanet.com>2001-05-10 15:06:35 -0600
commit9192600eb7c52f2675a67548849409dec2364165 (patch)
tree32fd0eb2c34334b7806726cf2dc9f8a893ea6fc8 /mysql-test/r/bdb.result
parent9afb49f53cb7b8da7519f45f588a78b559013de3 (diff)
parentb59b5f4b6ec6bd5b0eb8cee832b6d4f51fa646fc (diff)
downloadmariadb-git-9192600eb7c52f2675a67548849409dec2364165.tar.gz
Merged with 3.23, needs further fix-up
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union acconfig.h: Auto merged acinclude.m4: Auto merged include/myisam.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7: Auto merged BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439: Auto merged client/mysqltest.c: Auto merged sql/lex.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/table.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged Docs/manual.texi: merged client/errmsg.c: merged configure.in: merged sql/mysqld.cc: merged sql/sql_select.cc: merged, needs manual fixing sql/sql_yacc.yy: merged, needs manual fixing
Diffstat (limited to 'mysql-test/r/bdb.result')
-rw-r--r--mysql-test/r/bdb.result17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result
index 2e760ae5b75..5e227313e4a 100644
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -492,3 +492,20 @@ a 1
a 2
MIN(B) MAX(b)
1 1
+id
+0
+1
+2
+id
+0
+1
+2
+id
+0
+1
+2
+id id3
+0 0
+1 1
+2 2
+100 2