database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge

Browse Source 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1


libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge.  (Seems to need null-merging.)
sql/mysqld.cc:
  Manual merge + formatting change.
sql/sql_show.cc:
  Manual merge
This commit is contained in:
unknown
2006-07-10 17:20:39 -04:00
parent 8154ca618b 2f45384bf1
commit a6edf110bc
13 changed files with 221 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/t/variables.test
View File

@ -301,6 +301,22 @@ set tx_isolation="READ-COMMITTED";
set wait_timeout=100;
set log_warnings=1;
#
# Bugs: #20392: INSERT_ID session variable has weird value
#
select @@session.insert_id;
set @save_insert_id=@@session.insert_id;
set session insert_id=20;
select @@session.insert_id;
set session last_insert_id=100;
select @@session.insert_id;
select @@session.last_insert_id;
select @@session.insert_id;
set @@session.insert_id=@save_insert_id;
select @@session.insert_id;
#
# key buffer
#