bk commit into 5.2 tree (antony:1.2583)

[antony]

Below is the list of changes that have just been committed into a local
5.2 repository of antony. When antony 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@stripped, 2007-08-26 04:20:51-07:00, antony@stripped +2 -0
  post merge fixes

  mysql-test/r/ndb_column_properties.result@stripped, 2007-08-26 04:20:46-07:00, antony@stripped +9 -9
    post merge fixes - change in errorcode

  sql/sql_base.cc@stripped, 2007-08-26 04:20:47-07:00, antony@stripped +6 -0
    post merge fixes - restore missing code

diff -Nrup a/mysql-test/r/ndb_column_properties.result b/mysql-test/r/ndb_column_properties.result
--- a/mysql-test/r/ndb_column_properties.result	2007-07-12 06:48:24 -07:00
+++ b/mysql-test/r/ndb_column_properties.result	2007-08-26 04:20:46 -07:00
@@ -11,7 +11,7 @@ INITIAL_SIZE 6M
 ENGINE NDB;
 create table t1 (a int column_format DYNAMIC STORAGE DISK) TABLESPACE ts1 engine NDB;
 Warnings:
-Warning	1475	DYNAMIC column a with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column a with STORAGE DISK is not supported, column will become FIXED
 select column_name, storage, format from information_schema.columns
 where table_name = "t1";
 column_name	storage	format
@@ -38,14 +38,14 @@ f CHAR(100) NOT NULL column_format FIXED
 f1 char(100) NOT NULL column_format DYNAMIC storage DISK,
 index (b)) TABLESPACE ts1 engine NDB;
 Warnings:
-Warning	1475	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
 insert into t1 (b, b1, d,d1,f,f1) values
 (1,1,"1","1","1","1"),
 (2,2,"2","2","2","2"),
 (3,3,"3","3","3","3");
 alter table t1 change column a a int column_format FIXED;
 Warnings:
-Warning	1475	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -80,7 +80,7 @@ f	Default	Fixed
 f1	Disk	Dynamic
 alter table t1 change column a a int storage disk;
 Warnings:
-Warning	1475	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -113,7 +113,7 @@ f1 Char(100;latin1_swedish_ci) NOT NULL 
 $PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
 alter table t1 change column a a int storage memory;
 Warnings:
-Warning	1475	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -146,10 +146,10 @@ f1 Char(100;latin1_swedish_ci) NOT NULL 
 $PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
 alter table t1 change column b b int NOT NULL storage memory;
 Warnings:
-Warning	1475	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
 alter table t1 add column a2 int column_format FIXED;
 Warnings:
-Warning	1475	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -184,7 +184,7 @@ a2 Int NULL AT=FIXED ST=MEMORY
 $PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
 alter table t1 add column c2 VARCHAR(100) column_format DYNAMIC;
 Warnings:
-Warning	1475	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -221,7 +221,7 @@ c2 Varchar(100;latin1_swedish_ci) NULL A
 $PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
 alter table t1 add column c3 VARCHAR(100) column_format FIXED;
 Warnings:
-Warning	1475	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning	1476	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nrup a/sql/sql_base.cc b/sql/sql_base.cc
--- a/sql/sql_base.cc	2007-08-26 01:01:08 -07:00
+++ b/sql/sql_base.cc	2007-08-26 04:20:47 -07:00
@@ -3551,6 +3551,12 @@ int open_tables(THD *thd, TABLE_LIST **s
   {
     safe_to_ignore_table= FALSE;
 
+    if (tables->lock_type == TL_WRITE_DEFAULT)
+    {
+      tables->lock_type= thd->update_lock_default;
+      DBUG_ASSERT(tables->lock_type >= TL_WRITE_ALLOW_WRITE);
+    }
+
     /*
       Ignore placeholders for derived tables. After derived tables
       processing, link to created temporary table will be put here.