bk commit into 5.0 tree (ramil:1.2181)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.2181 06/06/16 14:05:58 ramil@stripped +5 -0
  after-merge fixes.

  sql/sql_class.h
    1.289 06/06/16 14:05:45 ramil@stripped +2 -1
    after-merge fix.

  sql/sql_class.cc
    1.235 06/06/16 14:05:44 ramil@stripped +4 -0
    after-merge fix.

  sql/item_func.cc
    1.289 06/06/16 14:05:44 ramil@stripped +1 -1
    after-merge fix.

  sql/ha_archive.cc
    1.69 06/06/16 14:05:44 ramil@stripped +1 -1
    after-merge fix.

  mysql-test/r/rpl_log.result
    1.65 06/06/16 14:05:44 ramil@stripped +5 -5
    after-merge fix.

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0

--- 1.288/sql/item_func.cc	2006-06-15 17:37:40 +05:00
+++ 1.289/sql/item_func.cc	2006-06-16 14:05:44 +05:00
@@ -3296,7 +3296,7 @@ longlong Item_func_last_insert_id::val_i
     return value;                       // Avoid side effect of insert_id()
   }
   thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
-  return thd->insert_id();
+  return thd->last_insert_id_used ? thd->current_insert_id : thd->insert_id();
 }
 
 /* This function is just used to test speed of different functions */

--- 1.234/sql/sql_class.cc	2006-05-31 13:47:10 +05:00
+++ 1.235/sql/sql_class.cc	2006-06-16 14:05:44 +05:00
@@ -2050,7 +2050,9 @@ void THD::reset_sub_statement_state(Sub_
   backup->enable_slow_log= enable_slow_log;
   backup->last_insert_id=  last_insert_id;
   backup->next_insert_id=  next_insert_id;
+  backup->current_insert_id=  current_insert_id;
   backup->insert_id_used=  insert_id_used;
+  backup->last_insert_id_used=  last_insert_id_used;
   backup->clear_next_insert_id= clear_next_insert_id;
   backup->limit_found_rows= limit_found_rows;
   backup->examined_row_count= examined_row_count;
@@ -2099,7 +2101,9 @@ void THD::restore_sub_statement_state(Su
   enable_slow_log=  backup->enable_slow_log;
   last_insert_id=   backup->last_insert_id;
   next_insert_id=   backup->next_insert_id;
+  current_insert_id= backup->current_insert_id;
   insert_id_used=   backup->insert_id_used;
+  last_insert_id_used= backup->last_insert_id_used;
   clear_next_insert_id= backup->clear_next_insert_id;
   limit_found_rows= backup->limit_found_rows;
   sent_row_count=   backup->sent_row_count;

--- 1.288/sql/sql_class.h	2006-04-13 12:25:52 +05:00
+++ 1.289/sql/sql_class.h	2006-06-16 14:05:45 +05:00
@@ -1051,12 +1051,13 @@ class Sub_statement_state
 {
 public:
   ulonglong options;
-  ulonglong last_insert_id, next_insert_id;
+  ulonglong last_insert_id, next_insert_id, current_insert_id;
   ulonglong limit_found_rows;
   ha_rows    cuted_fields, sent_row_count, examined_row_count;
   ulong client_capabilities;
   uint in_sub_stmt;
   bool enable_slow_log, insert_id_used, clear_next_insert_id;
+  bool last_insert_id_used;
   my_bool no_send_ok;
   SAVEPOINT *savepoints;
 };

--- 1.68/sql/ha_archive.cc	2006-06-15 17:37:40 +05:00
+++ 1.69/sql/ha_archive.cc	2006-06-16 14:05:44 +05:00
@@ -1131,7 +1131,7 @@ int ha_archive::end_bulk_insert()
 int ha_archive::delete_all_rows()
 {
   DBUG_ENTER("ha_archive::delete_all_rows");
-  DBUG_RETURN(0);
+  DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 }
 
 /*

--- 1.64/mysql-test/r/rpl_log.result	2006-06-15 17:29:09 +05:00
+++ 1.65/mysql-test/r/rpl_log.result	2006-06-16 14:05:44 +05:00
@@ -107,11 +107,11 @@ reset master;
 set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-slave-bin.000001	4	Start	2	4	Server ver: VERSION, Binlog ver: 3
-slave-bin.000001	79	Intvar	2	79	LAST_INSERT_ID=1
-slave-bin.000001	107	Intvar	2	107	INSERT_ID=5
-slave-bin.000001	135	Query	2	135	use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	4	Format_desc	2	98	Server ver: VERSION, Binlog ver: 4
+slave-bin.000001	98	Intvar	2	126	LAST_INSERT_ID=1
+slave-bin.000001	126	Intvar	2	154	INSERT_ID=5
+slave-bin.000001	154	Query	2	289	use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
 select * from t1;
 a	b
 1	1