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

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/item.cc:
  Auto merged
parents de92664d ec1a4d55

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ mysqldev@build.mysql2.com 
mysqldev@melody.local

mysqldev@mysql.com

mysqldev@o2k.irixworld.net

ndbdev@dl145b.mysql.com

ndbdev@eel.hemma.oreland.se

ndbdev@ndbmaster.mysql.com

ndbdev@shark.
@@ -268,6 +269,7 @@ tonu@x153.internalnet 
tonu@x3.internalnet

tsmith@build.mysql.com

tulin@build.mysql.com

tulin@dl145b.mysql.com

tulin@mysql.com

ulli@morbus.(none)

venu@hundin.mysql.fi

mysql-test/r/ndb_restore.result

+1 −0
Original line number Diff line number Diff line
@@ -247,3 +247,4 @@ count(*) 
3

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

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

520093696,1

mysql-test/r/ps.result

+25 −0
Original line number Diff line number Diff line
@@ -570,3 +570,28 @@ id 
deallocate prepare stmt|

drop procedure p1|

drop table t1|

drop table if exists t1;

Warnings:

Note	1051	Unknown table 't1'

create table t1 (c1 int(11) not null, c2 int(11) not null,

primary key  (c1,c2), key c2 (c2), key c1 (c1));

insert into t1 values (200887, 860);

insert into t1 values (200887, 200887);

select * from t1 where (c1=200887 and c2=200887) or c2=860;

c1	c2

200887	860

200887	200887

prepare stmt from

"select * from t1 where (c1=200887 and c2=200887) or c2=860";

execute stmt;

c1	c2

200887	860

200887	200887

prepare stmt from

"select * from t1 where (c1=200887 and c2=?) or c2=?";

set @a=200887, @b=860;

execute stmt using @a, @b;

c1	c2

200887	860

200887	200887

deallocate prepare stmt;

mysql-test/r/type_datetime.result

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ date numfacture expedition 
0000-00-00 00:00:00	1212	0001-00-00 00:00:00

EXPLAIN SELECT * FROM t1 WHERE expedition='0001-00-00 00:00:00';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	expedition	expedition	8	const	1	Using where

1	SIMPLE	t1	ref	expedition	expedition	8	const	1	

drop table t1;

create table t1 (a datetime not null, b datetime not null);

insert into t1 values (now(), now());

mysql-test/t/ndb_restore.test

+6 −0
Original line number Diff line number Diff line
@@ -209,3 +209,9 @@ select count(*) 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

--enable_warnings



#

# Test BUG#10287

#



--exec $NDB_TOOLS_DIR/ndb_select_all -d sys -D , SYSTAB_0 | grep 520093696