bk commit into 5.2 tree (timour:1.2557)

[timour]

Below is the list of changes that have just been committed into a local
5.2 repository of tkatchaounov. When tkatchaounov 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-17 17:22:44+03:00, timour@stripped +2 -0
  WL#1110: Subquery optimization: materialization
  
  Disabled warnings when dropping possibly non-existing tables in the WL test files.

  mysql-test/r/subselect_mat.result@stripped, 2007-08-17 17:22:41+03:00, timour@stripped +0 -20
    - disabled warnings when dropping possibly non-existing tables

  mysql-test/t/subselect_mat.test@stripped, 2007-08-17 17:22:41+03:00, timour@stripped +14 -0
    - disabled warnings when dropping possibly non-existing tables

# 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:	timour
# Host:	zmeiux.home
# Root:	/home/tkatchaounov/mysql/src/5.2-1110

--- 1.1/mysql-test/r/subselect_mat.result	2007-08-17 12:45:05 +03:00
+++ 1.2/mysql-test/r/subselect_mat.result	2007-08-17 17:22:41 +03:00
@@ -1,8 +1,4 @@
 drop table if exists t1, t2, t3;
-Warnings:
-Note	1051	Unknown table 't1'
-Note	1051	Unknown table 't2'
-Note	1051	Unknown table 't3'
 create table t1 (a1 char(8), a2 char(8));
 create table t2 (b1 char(8), b2 char(8));
 create table t3 (c1 char(8), c2 char(8));
@@ -47,10 +43,6 @@
 set @blob_len = 16;
 set @suffix_len = @blob_len - @prefix_len;
 drop table if exists t1_16, t2_16, t3_16;
-Warnings:
-Note	1051	Unknown table 't1_16'
-Note	1051	Unknown table 't2_16'
-Note	1051	Unknown table 't3_16'
 create table t1_16 (a1 blob(16), a2 blob(16));
 create table t2_16 (b1 blob(16), b2 blob(16));
 create table t3_16 (c1 blob(16), c2 blob(16));
@@ -164,10 +156,6 @@
 set @blob_len = 512;
 set @suffix_len = @blob_len - @prefix_len;
 drop table if exists t1_512, t2_512, t3_512;
-Warnings:
-Note	1051	Unknown table 't1_512'
-Note	1051	Unknown table 't2_512'
-Note	1051	Unknown table 't3_512'
 create table t1_512 (a1 blob(512), a2 blob(512));
 create table t2_512 (b1 blob(512), b2 blob(512));
 create table t3_512 (c1 blob(512), c2 blob(512));
@@ -281,10 +269,6 @@
 set @blob_len = 1024;
 set @suffix_len = @blob_len - @prefix_len;
 drop table if exists t1_1024, t2_1024, t3_1024;
-Warnings:
-Note	1051	Unknown table 't1_1024'
-Note	1051	Unknown table 't2_1024'
-Note	1051	Unknown table 't3_1024'
 create table t1_1024 (a1 blob(1024), a2 blob(1024));
 create table t2_1024 (b1 blob(1024), b2 blob(1024));
 create table t3_1024 (c1 blob(1024), c2 blob(1024));
@@ -398,10 +382,6 @@
 set @blob_len = 1025;
 set @suffix_len = @blob_len - @prefix_len;
 drop table if exists t1_1025, t2_1025, t3_1025;
-Warnings:
-Note	1051	Unknown table 't1_1025'
-Note	1051	Unknown table 't2_1025'
-Note	1051	Unknown table 't3_1025'
 create table t1_1025 (a1 blob(1025), a2 blob(1025));
 create table t2_1025 (b1 blob(1025), b2 blob(1025));
 create table t3_1025 (c1 blob(1025), c2 blob(1025));

--- 1.1/mysql-test/t/subselect_mat.test	2007-08-17 12:45:06 +03:00
+++ 1.2/mysql-test/t/subselect_mat.test	2007-08-17 17:22:41 +03:00
@@ -3,7 +3,9 @@
 # (WL#1110: Subquery optimization: materialization)
 #
 
+--disable_warnings
 drop table if exists t1, t2, t3;
+--enable_warnings
 
 create table t1 (a1 char(8), a2 char(8));
 create table t2 (b1 char(8), b2 char(8));
@@ -68,7 +70,10 @@
 set @blob_len = 16;
 set @suffix_len = @blob_len - @prefix_len;
 
+--disable_warnings
 drop table if exists t1_16, t2_16, t3_16;
+--enable_warnings
+
 create table t1_16 (a1 blob(16), a2 blob(16));
 create table t2_16 (b1 blob(16), b2 blob(16));
 create table t3_16 (c1 blob(16), c2 blob(16));
@@ -155,7 +160,10 @@
 set @blob_len = 512;
 set @suffix_len = @blob_len - @prefix_len;
 
+--disable_warnings
 drop table if exists t1_512, t2_512, t3_512;
+--enable_warnings
+
 create table t1_512 (a1 blob(512), a2 blob(512));
 create table t2_512 (b1 blob(512), b2 blob(512));
 create table t3_512 (c1 blob(512), c2 blob(512));
@@ -242,7 +250,10 @@
 set @blob_len = 1024;
 set @suffix_len = @blob_len - @prefix_len;
 
+--disable_warnings
 drop table if exists t1_1024, t2_1024, t3_1024;
+--enable_warnings
+
 create table t1_1024 (a1 blob(1024), a2 blob(1024));
 create table t2_1024 (b1 blob(1024), b2 blob(1024));
 create table t3_1024 (c1 blob(1024), c2 blob(1024));
@@ -329,7 +340,10 @@
 set @blob_len = 1025;
 set @suffix_len = @blob_len - @prefix_len;
 
+--disable_warnings
 drop table if exists t1_1025, t2_1025, t3_1025;
+--enable_warnings
+
 create table t1_1025 (a1 blob(1025), a2 blob(1025));
 create table t2_1025 (b1 blob(1025), b2 blob(1025));
 create table t3_1025 (c1 blob(1025), c2 blob(1025));