Commit ac066c95 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

Merge lgrimmer@work.mysql.com:/home/bk/mysql 

into mysql.com:/space/my/mysql-3.23
parents 621a80b0 48e94ed0

mysql-test/mysql-test-run.sh

+2 −1
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ SLAVE_MYPID="$MYRUN_DIR/mysqld-slave.pid" 
SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld-slave.log"

SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err"



CLIENT_MYLOG="$MYSQL_TEST_DIR/var/log/client.log"

SMALL_SERVER="-O key_buffer_size=1M -O sort_buffer=256K -O max_heap_table_size=1M"



export MASTER_MYPORT
@@ -344,7 +345,7 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov 
#--

wait_for_server_start ()

{

   $MYSQLADMIN --no-defaults -u $DBUSER --silent -O connect_timeout=10 -w3 --host=$hostname --port=$1  ping >/dev/null 2>&1

   $MYSQLADMIN --no-defaults -u $DBUSER --silent -O connect_timeout=10 -w3 --host=$hostname --port=$1  ping >> $CLIENT_MYLOG 2>&1

   exit_code=$?

   if [ $exit_code != 0 ]; then

	echo "Error: Could not start $2, exit code $exit_code";

mysql-test/r/func_test.result

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
1	1	1

-1.49 or -1.49	0.6 or 0.6

1	1

start	ctime1	ctime2

start	ctime1	ctime2

2002-11-04 00:00:00	20021029165106	20021105164731

5 between 0 and 10 between 0 and 1	(5 between 0 and 10) between 0 and 1

0	1

1 and 2 between 2 and 10	2 between 2 and 10 and 1

mysql-test/r/func_time.result

+5 −0
Original line number Diff line number Diff line
@@ -220,3 +220,8 @@ to_days("0000-00-00") to_days(d) to_days(dt) to_days(t) to_days(c) 
NULL	NULL	NULL	NULL	NULL

extract(MONTH FROM "0000-00-00")	extract(MONTH FROM d)	extract(MONTH FROM dt)	extract(MONTH FROM t)	extract(MONTH FROM c)

0	0	0	0	0

start	ctime1	ctime2

start	ctime1	ctime2

2002-11-04 00:00:00	20021029165106	20021105164731

start	ctime1	ctime2

2002-11-04 00:00:00	2002-10-29 16:51:06	2002-11-05 16:47:31

mysql-test/r/null_key.result

+17 −0
Original line number Diff line number Diff line
@@ -126,3 +126,20 @@ order_id product_id product_type 
3d7ce39b5d4b3e3d22aaafe9b633de51	5880836	3

id	id

id	id

id	id2

NULL	0

1	1

id	id2

NULL	0

id	id2

NULL	0

1	1

id	id2

NULL	0

1	1

id	id2

1	1

id	id2

1	1

id	id2

1	1

mysql-test/t/func_test.test

+0 −10
Original line number Diff line number Diff line
@@ -15,16 +15,6 @@ select 2 between 1 and 3, "monty" between "max" and "my",2=2 and "monty" between 
select 'b' between 'a' and 'c', 'B' between 'a' and 'c';

select 2 in (3,2,5,9,5,1),"monty" in ("david","monty","allan"), 1.2 in (1.4,1.2,1.0);

select -1.49 or -1.49,0.6 or 0.6;

drop table if exists t1,t2;

CREATE TABLE t1 ( start datetime default NULL) TYPE=MyISAM;

INSERT INTO t1 VALUES ('2002-10-21 00:00:00');

INSERT INTO t1 VALUES ('2002-10-28 00:00:00');

INSERT INTO t1 VALUES ('2002-11-04 00:00:00');

CREATE TABLE t2 ( ctime1 timestamp(14) NOT NULL, ctime2 timestamp(14) NOT NULL) TYPE=MyISAM;

INSERT INTO t2 VALUES (20021029165106,20021105164731);

select * from t1, t2 where t1.start between t2.ctime1 and t2.ctime2;

select * from t1, t2 where t1.start >= t2.ctime1 and t1.start <= t2.ctime2;

drop table if exists t1,t2;



#

# Wrong usage of functions