Commit 7a1458cc authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/mysqldump-max.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
parents bd6a8cb3 1023e010

mysql-test/r/mysqldump-max.result

+1 −18
Original line number Diff line number Diff line 
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";

mysql-test/r/rpl_trigger.result

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ get_lock("bug12480",2) 
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);

mysql-test/r/type_newdecimal.result

+0 −2
Original line number Diff line number Diff line
@@ -978,8 +978,6 @@ t1 CREATE TABLE `t1` ( 
) 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;

mysql-test/t/mysqldump-max.test

+3 −8
Original line number Diff line number Diff line
@@ -3,14 +3,9 @@ 
--source include/have_innodb.inc

--source include/have_archive.inc



--disable-warnings

drop table if exists t1; 

drop table if exists t2; 

drop table if exists t3; 

drop table if exists t4; 

drop table if exists t5; 

drop table if exists t6; 

--enable-warnings

--disable_warnings

drop table if exists t1, t2, t3, t4, t5, t6;

--enable_warnings



create table t1 (id int(8), name varchar(32));

create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";

mysql-test/t/rpl_trigger.test

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ select get_lock("bug12480",2); 
connection default;



create table t1 (a datetime,b  datetime, c datetime);

--ignore_warnings

--disable_warnings

drop function if exists bug12480;

--enable_warnings