Commit 1a8d41a5 authored by unknown's avatar unknown
Browse files

Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/jan/mysql-4.1
parents c6257d20 184f4137

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,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

nick@mysql.com
@@ -240,6 +241,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

cmd-line-utils/libedit/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ libedit_a_DEPENDENCIES = @LIBEDIT_LOBJECTS@ 


pkginclude_HEADERS =	readline/readline.h



noinst_HEADERS =	chared.h el.h histedit.h key.h parse.h refresh.h sig.h \

noinst_HEADERS =	chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \

			sys.h tokenizer.h config.h hist.h map.h prompt.h read.h \

			search.h tty.h libedit_term.h

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
@@ -494,3 +494,28 @@ SELECT FOUND_ROWS(); 
FOUND_ROWS()

2

deallocate prepare stmt;

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/t/ndb_restore.test

+6 −0
Original line number Diff line number Diff line
@@ -208,3 +208,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