bk commit into 5.1 tree (msvensson:1.2332)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-10-24 17:55:39+02:00, msvensson@neptunus.(none) +5 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2078.83

  mysql-test/r/mysqldump-max.result@stripped, 2006-10-24 17:55:35+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.2.1.3

  mysql-test/r/rpl_trigger.result@stripped, 2006-10-24 17:55:35+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.4.1.6

  mysql-test/r/type_newdecimal.result@stripped, 2006-10-24 17:55:35+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.36.1.6

  mysql-test/t/rpl_trigger.test@stripped, 2006-10-24 17:55:35+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.4.1.5

  mysql-test/t/type_newdecimal.test@stripped, 2006-10-24 17:55:35+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.33.1.6

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.49/mysql-test/r/type_newdecimal.result	2006-10-24 17:55:44 +02:00
+++ 1.50/mysql-test/r/type_newdecimal.result	2006-10-24 17:55:44 +02:00
@@ -978,8 +978,6 @@
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 drop procedure if exists wg2;
-Warnings:
-Note	1305	PROCEDURE wg2 does not exist
 create procedure wg2()
 begin
 declare v int default 1;

--- 1.42/mysql-test/t/type_newdecimal.test	2006-10-24 17:55:44 +02:00
+++ 1.43/mysql-test/t/type_newdecimal.test	2006-10-24 17:55:44 +02:00
@@ -1000,9 +1000,9 @@
 #
 # Bug 12938 (arithmetic loop's zero)
 #
---disable-warnings
+--disable_warnings
 drop procedure if exists wg2;
---enable-warnings
+--enable_warnings
 delimiter //;
 create procedure wg2()
 begin

--- 1.9/mysql-test/r/rpl_trigger.result	2006-10-24 17:55:44 +02:00
+++ 1.10/mysql-test/r/rpl_trigger.result	2006-10-24 17:55:44 +02:00
@@ -74,8 +74,6 @@
 1
 create table t1 (a datetime,b  datetime, c datetime);
 drop function if exists bug12480;
-Warnings:
-Note	1305	FUNCTION bug12480 does not exist
 create function bug12480() returns datetime
 begin
 set @a=get_lock("bug12480",2);

--- 1.10/mysql-test/t/rpl_trigger.test	2006-10-24 17:55:44 +02:00
+++ 1.11/mysql-test/t/rpl_trigger.test	2006-10-24 17:55:44 +02:00
@@ -70,7 +70,7 @@
 connection default;
 
 create table t1 (a datetime,b  datetime, c datetime);
---ignore_warnings
+--disable_warnings
 drop function if exists bug12480;
 --enable_warnings
 

--- 1.6/mysql-test/r/mysqldump-max.result	2006-10-24 17:55:44 +02:00
+++ 1.7/mysql-test/r/mysqldump-max.result	2006-10-24 17:55:44 +02:00
@@ -1,21 +1,4 @@
-drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 't1'
-drop table if exists t2;
-Warnings:
-Note	1051	Unknown table 't2'
-drop table if exists t3;
-Warnings:
-Note	1051	Unknown table 't3'
-drop table if exists t4;
-Warnings:
-Note	1051	Unknown table 't4'
-drop table if exists t5;
-Warnings:
-Note	1051	Unknown table 't5'
-drop table if exists t6;
-Warnings:
-Note	1051	Unknown table 't6'
+drop table if exists t1, t2, t3, t4, t5, t6;
 create table t1 (id int(8), name varchar(32));
 create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
 create table t3 (id int(8), name varchar(32)) ENGINE="MEMORY";