Commit 5c93c3e1 authored by unknown's avatar unknown
Browse files

merge 5.0->5.0-ndb 


BitKeeper/etc/logging_ok:
  auto-union
ndb/test/tools/Makefile.am:
  Auto merged
parents fa7b260a 613201b8

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ lenz@mysql.com 
magnus@neptunus.(none)

magnus@shellback.(none)

marko@hundin.mysql.fi

marty@linux.site

marty@shark.

mats@mysql.com

matt@booty.(none)

mysql-test/r/func_str.result

+9 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ tcx.se .se 
select concat(':',ltrim('  left  '),':',rtrim('  right  '),':');

concat(':',ltrim('  left  '),':',rtrim('  right  '),':')

:left  :  right:

select concat(':',trim(leading from '  left  '),':',trim(trailing from '  right  '),':');

concat(':',trim(leading from '  left  '),':',trim(trailing from '  right  '),':')

:left  :  right:

select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':');

concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':')

:left: right:
@@ -703,3 +706,9 @@ NULL 
select trim('xyz' from null) as "must_be_null";

must_be_null

NULL

select trim(leading NULL from 'kate') as "must_be_null";

must_be_null

NULL

select trim(trailing NULL from 'xyz') as "must_be_null";

must_be_null

NULL

mysql-test/r/mysqldump.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1, `"t"1`;

DROP TABLE IF EXISTS t1, `"t"1`, t1aa,t2aa;

drop database if exists mysqldump_test_db;

CREATE TABLE t1(a int);

INSERT INTO t1 VALUES (1), (2);

mysql-test/r/show_check.result

+1 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

drop table if exists t1aa,t2aa;

drop database if exists mysqltest;

delete from mysql.user where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';

delete from mysql.db where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';

mysql-test/r/sp.result

+2 −5
Original line number Diff line number Diff line
@@ -1639,12 +1639,9 @@ yz,yz 
drop procedure bug3368|

drop table t3|

drop table if exists t3|

create table t3 (f1 int, f2 int);

insert into t3 values (1,1);

--disable_warnings|

create table t3 (f1 int, f2 int)|

insert into t3 values (1,1)|

drop procedure if exists bug4579_1|

Warnings:

Note	1305	PROCEDURE bug4579_1 does not exist

create procedure bug4579_1 ()

begin

declare sf1 int;