bk commit into 5.1 tree (svoj:1.2298)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj 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.2298 06/04/06 16:44:26 svoj@april.(none) +5 -0
  Merge april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
  into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.1-new

  sql/sql_delete.cc
    1.179 06/04/06 16:44:20 svoj@april.(none) +2 -1
    Manual merge

  sql/sql_parse.cc
    1.536 06/04/06 16:40:54 svoj@april.(none) +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.187 06/04/06 16:40:54 svoj@april.(none) +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.203 06/04/06 16:40:54 svoj@april.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.100 06/04/06 16:40:54 svoj@april.(none) +0 -0
    Auto merged

# 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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG14945/mysql-5.1-new/RESYNC

--- 1.178/sql/sql_delete.cc	2006-03-29 16:27:31 +05:00
+++ 1.179/sql/sql_delete.cc	2006-04-06 16:44:20 +05:00
@@ -916,8 +916,7 @@
       DBUG_RETURN(TRUE);
     }
     if (!ha_check_storage_engine_flag(ha_resolve_by_legacy_type(thd, table_type),
-                                      HTON_CAN_RECREATE)
-        || thd->lex->sphead)
+                                      HTON_CAN_RECREATE))
       goto trunc_by_del;
 
     if (lock_and_wait_for_table_name(thd, table_list))

--- 1.535/sql/sql_parse.cc	2006-03-29 16:27:31 +05:00
+++ 1.536/sql/sql_parse.cc	2006-04-06 16:40:54 +05:00
@@ -3387,7 +3387,7 @@
       Don't allow this within a transaction because we want to use
       re-generate table
     */
-    if ((thd->locked_tables && !lex->sphead) || thd->active_transaction())
+    if (thd->locked_tables || thd->active_transaction())
     {
       my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
                  ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));

--- 1.202/mysql-test/r/sp.result	2006-03-30 20:07:57 +05:00
+++ 1.203/mysql-test/r/sp.result	2006-04-06 16:40:54 +05:00
@@ -4821,6 +4821,17 @@
 declare x int;
 select id from t1 order by x;
 end|
+drop procedure if exists bug14945|
+create table t3 (id int not null auto_increment primary key)|
+create procedure bug14945() deterministic truncate t3|
+insert into t3 values (null)|
+call bug14945()|
+insert into t3 values (null)|
+select * from t3|
+id
+1
+drop table t3|
+drop procedure bug14945|
 create procedure bug16474_2(x int)
 select id from t1 order by x|
 call bug16474_1()|

--- 1.186/mysql-test/t/sp.test	2006-03-30 20:07:57 +05:00
+++ 1.187/mysql-test/t/sp.test	2006-04-06 16:40:54 +05:00
@@ -5672,6 +5672,21 @@
   select id from t1 order by x;
 end|
 
+# 
+# BUG#14945: Truncate table doesn't reset the auto_increment counter
+#
+--disable_warnings
+drop procedure if exists bug14945|
+--enable_warnings
+create table t3 (id int not null auto_increment primary key)|
+create procedure bug14945() deterministic truncate t3|
+insert into t3 values (null)|
+call bug14945()|
+insert into t3 values (null)|
+select * from t3|
+drop table t3|
+drop procedure bug14945|
+
 # This does NOT order by column index; variable is an expression.
 create procedure bug16474_2(x int)
   select id from t1 order by x|