diff options
| author | unknown <monty@work.mysql.com> | 2001-09-13 09:52:35 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-13 09:52:35 +0200 |
| commit | c96bf55b9c8641d4b1c2ece0c0314071bc1022df (patch) | |
| tree | 1fb0fbca5b7a4edebe2c26a5ed0b272e92bc21f2 /mysql-test/r | |
| parent | 9e4206b990df875e063a07784c77cc39dc394654 (diff) | |
| parent | c88dd9b291cf7fe9086102d74d255f4b880d1486 (diff) | |
| download | mariadb-git-c96bf55b9c8641d4b1c2ece0c0314071bc1022df.tar.gz | |
Merge with 3.23.42
configure.in:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
heap/hp_test2.c:
Auto merged
include/global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql/net.c:
Auto merged
myisam/sort.c:
Auto merged
sql-bench/test-create.sh:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/bdb.test:
Auto merged
Docs/manual.texi:
merge
myisam/myisampack.c:
merge
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/bdb.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/identity.result | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result index 39b4962ef58..e66ca657484 100644 --- a/mysql-test/r/bdb.result +++ b/mysql-test/r/bdb.result @@ -524,3 +524,6 @@ a b a b a b 1 1 1 2 +id id2 id3 dummy1 +id id2 id3 dummy1 +NULL NULL NULL NULL diff --git a/mysql-test/r/identity.result b/mysql-test/r/identity.result new file mode 100644 index 00000000000..45968248d26 --- /dev/null +++ b/mysql-test/r/identity.result @@ -0,0 +1,4 @@ +last_insert_id(345) +345 +@@IDENTITY last_insert_id() +345 345 |