bk commit into 5.0 tree (bar:1.2175)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2175 06/06/22 19:40:59 bar@stripped +2 -0
  Additional test for Bugs#20392: INSERT_ID session variable has weird value
  sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID,
  as Guilhem suggested.

  mysql-test/t/variables.test
    1.62 06/06/22 19:40:50 bar@stripped +6 -0
    Additional test

  mysql-test/r/variables.result
    1.86 06/06/22 19:40:49 bar@stripped +10 -0
    Additional test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0-kt.b20392

--- 1.85/mysql-test/r/variables.result	2006-06-22 19:10:00 +05:00
+++ 1.86/mysql-test/r/variables.result	2006-06-22 19:40:49 +05:00
@@ -429,6 +429,16 @@ set session insert_id=20;
 select @@session.insert_id;
 @@session.insert_id
 20
+set session last_insert_id=100;
+select @@session.insert_id;
+@@session.insert_id
+20
+select @@session.last_insert_id;
+@@session.last_insert_id
+100
+select @@session.insert_id;
+@@session.insert_id
+20
 set @@session.insert_id=@save_insert_id;
 select @@session.insert_id;
 @@session.insert_id

--- 1.61/mysql-test/t/variables.test	2006-06-22 19:10:00 +05:00
+++ 1.62/mysql-test/t/variables.test	2006-06-22 19:40:50 +05:00
@@ -308,6 +308,12 @@ 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;