bk commit into 5.0 tree (konstantin:1.2010)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.2010 05/11/25 18:53:55 konstantin@stripped +4 -0
  Post-merge fixes.

  sql/sql_table.cc
    1.289 05/11/25 18:53:49 konstantin@stripped +7 -8
    Post-merge fixes.

  mysql-test/r/select.result
    1.113 05/11/25 18:53:49 konstantin@stripped +8 -0
    Post-merge fixes.

  mysql-test/r/ps.result
    1.55 05/11/25 18:53:49 konstantin@stripped +19 -0
    Post-merge fixes.

  mysql-test/r/ndb_basic.result
    1.31 05/11/25 18:53:49 konstantin@stripped +4 -4
    Post-merge fixes.

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.288/sql/sql_table.cc	2005-11-25 13:57:07 +03:00
+++ 1.289/sql/sql_table.cc	2005-11-25 18:53:49 +03:00
@@ -729,7 +729,7 @@
           Create the typelib in prepared statement memory if we're
           executing one.
         */
-        MEM_ROOT *stmt_root= thd->current_arena->mem_root;
+        MEM_ROOT *stmt_root= thd->stmt_arena->mem_root;
 
         interval= sql_field->interval= typelib(stmt_root,
                                                sql_field->interval_list);
@@ -763,21 +763,20 @@
       */
       if (sql_field->def && cs != sql_field->def->collation.collation)
       {
-        Item_arena backup_arena;
-        bool need_to_change_arena=
-          !thd->current_arena->is_conventional_execution();
+        Query_arena backup_arena;
+        bool need_to_change_arena= !thd->stmt_arena->is_conventional();
         if (need_to_change_arena)
         {
           /* Asser that we don't do that at every PS execute */
-          DBUG_ASSERT(thd->current_arena->is_first_stmt_execute() ||
-                      thd->current_arena->is_first_sp_execute());
-          thd->set_n_backup_item_arena(thd->current_arena, &backup_arena);
+          DBUG_ASSERT(thd->stmt_arena->is_first_stmt_execute() ||
+                      thd->stmt_arena->is_first_sp_execute());
+          thd->set_n_backup_active_arena(thd->stmt_arena, &backup_arena);
         }
 
         sql_field->def= sql_field->def->safe_charset_converter(cs);
 
         if (need_to_change_arena)
-          thd->restore_backup_item_arena(thd->current_arena, &backup_arena);
+          thd->restore_active_arena(thd->stmt_arena, &backup_arena);
 
         if (! sql_field->def)
         {

--- 1.30/mysql-test/r/ndb_basic.result	2005-11-25 13:42:45 +03:00
+++ 1.31/mysql-test/r/ndb_basic.result	2005-11-25 18:53:49 +03:00
@@ -667,13 +667,13 @@
 57	newval
 58	newval
 drop table t1;
+CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;
+select * from t1;
+b
+drop table t1;
 create table atablewithareallylongandirritatingname (a int);
 insert into atablewithareallylongandirritatingname values (2);
 select * from atablewithareallylongandirritatingname;
 a
 2
 drop table atablewithareallylongandirritatingname;
-CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;
-select * from t1;
-b
-drop table t1;

--- 1.112/mysql-test/r/select.result	2005-11-25 13:57:07 +03:00
+++ 1.113/mysql-test/r/select.result	2005-11-25 18:53:49 +03:00
@@ -2708,6 +2708,14 @@
 count(f2) >0
 1
 drop table t1,t2;
+create table t1 (f1 int,f2 int);
+insert into t1 values(1,1);
+create table t2 (f3 int, f4 int, primary key(f3,f4));
+insert into t2 values(1,1);
+select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 from t2));
+f1	f2
+1	1
+drop table t1,t2;
 CREATE TABLE t1 ( city char(30) );
 INSERT INTO t1 VALUES ('London');
 INSERT INTO t1 VALUES ('Paris');

--- 1.54/mysql-test/r/ps.result	2005-11-25 13:57:07 +03:00
+++ 1.55/mysql-test/r/ps.result	2005-11-25 18:53:49 +03:00
@@ -806,3 +806,22 @@
 @@tx_isolation
 REPEATABLE-READ
 deallocate prepare stmt;
+prepare stmt from "create temporary table t1 (letter enum('','a','b','c')
+not null)";
+execute stmt;
+drop table t1;
+execute stmt;
+drop table t1;
+execute stmt;
+drop table t1;
+set names latin1;
+prepare stmt from "create table t1 (a enum('test') default 'test')
+ character set utf8";
+execute stmt;
+drop table t1;
+execute stmt;
+drop table t1;
+execute stmt;
+drop table t1;
+set names default;
+deallocate prepare stmt;