Commit 9eab6fb8 authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

parents 39329fd5 ab12784d

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ bar@bar.udmsearch.izhnet.ru 
bell@sanja.is.com.ua

bk@admin.bk

davida@isil.mysql.com

gluh@gluh.(none)

heikki@donna.mysql.fi

heikki@hundin.mysql.fi

heikki@rescue.

mysql-test/r/func_test.result

+14 −0
Original line number Diff line number Diff line
@@ -46,6 +46,20 @@ select 3 ^ 11, 1 ^ 1, 1 ^ 0, 1 ^ NULL, NULL ^ 1; 
select 1 XOR 1, 1 XOR 0, 0 XOR 1, 0 XOR 0, NULL XOR 1, 1 XOR NULL, 0 XOR NULL;

1 XOR 1	1 XOR 0	0 XOR 1	0 XOR 0	NULL XOR 1	1 XOR NULL	0 XOR NULL

0	1	1	0	NULL	NULL	NULL

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;

start	ctime1	ctime2

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

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

start	ctime1	ctime2

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

drop table if exists t1,t2;

select 5 between 0 and 10 between 0 and 1,(5 between 0 and 10) between 0 and 1;

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

0	1

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ BEGIN; 
SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;

SELECT @@tx_isolation,@@global.tx_isolation;

@@tx_isolation	@@global.tx_isolation

SERIALIZABLE	READ-COMMITTED

SERIALIZABLE	REPEATABLE-READ

insert into t1 (code, name) values (1, 'Tim'), (1, 'Monty'), (2, 'David');

select id, code, name from t1 order by id;

id	code	name

mysql-test/t/func_test.test

+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,16 @@ select 2 in (3,2,5,9,5,1),"monty" in ("david","monty","allan"), 1.2 in (1.4,1.2, 
select -1.49 or -1.49,0.6 or 0.6;

select 3 ^ 11, 1 ^ 1, 1 ^ 0, 1 ^ NULL, NULL ^ 1;

select 1 XOR 1, 1 XOR 0, 0 XOR 1, 0 XOR 0, NULL XOR 1, 1 XOR NULL, 0 XOR NULL;

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

sql-bench/bench-init.pl.sh

+8 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n"; 
$|=1;				# Output data immediately



$opt_skip_test=$opt_skip_create=$opt_skip_delete=$opt_verbose=$opt_fast_insert=$opt_lock_tables=$opt_debug=$opt_skip_delete=$opt_fast=$opt_force=$opt_log=$opt_use_old_results=$opt_help=$opt_odbc=$opt_small_test=$opt_small_tables=$opt_samll_key_tables=$opt_stage=$opt_old_headers=$opt_die_on_errors=$opt_tcpip=$opt_random=0;

$opt_cmp=$opt_user=$opt_password="";

$opt_cmp=$opt_user=$opt_password=$opt_connect_options="";

$opt_server="mysql"; $opt_dir="output";

$opt_host="localhost";$opt_database="test";

$opt_machine=""; $opt_suffix="";
@@ -55,11 +55,11 @@ $log_prog_args=join(" ", skip_arguments(\@ARGV,"comments","cmp","server", 
					"use-old-results","skip-test",

					"optimization","hw",

					"machine", "dir", "suffix", "log"));

GetOptions("skip-test=s","comments=s","cmp=s","server=s","user=s","host=s","database=s","password=s","loop-count=i","row-count=i","skip-create","skip-delete","verbose","fast-insert","lock-tables","debug","fast","force","field-count=i","regions=i","groups=i","time-limit=i","log","use-old-results","machine=s","dir=s","suffix=s","help","odbc","small-test","small-tables","small-key-tables","stage=i","threads=i","random","old-headers","die-on-errors","create-options=s","hires","tcpip","silent","optimization=s","hw=s","socket=s") || usage();

GetOptions("skip-test=s","comments=s","cmp=s","server=s","user=s","host=s","database=s","password=s","loop-count=i","row-count=i","skip-create","skip-delete","verbose","fast-insert","lock-tables","debug","fast","force","field-count=i","regions=i","groups=i","time-limit=i","log","use-old-results","machine=s","dir=s","suffix=s","help","odbc","small-test","small-tables","small-key-tables","stage=i","threads=i","random","old-headers","die-on-errors","create-options=s","hires","tcpip","silent","optimization=s","hw=s","socket=s","connect-options=s") || usage();



usage() if ($opt_help);

$server=get_server($opt_server,$opt_host,$opt_database,$opt_odbc,

                   machine_part(), $opt_socket);

                   machine_part(), $opt_socket, $opt_connect_options);

$limits=merge_limits($server,$opt_cmp);

$date=date();

@estimated=(0.0,0.0,0.0);		# For estimated time support
@@ -594,6 +594,10 @@ All benchmarks takes the following options: 
--hw='some comments'

 Add coments about hardware used for this test.



--connect-options='some connect options'

  Add options, which uses at DBI connect.

  For example --connect-options=mysql_read_default_file=/etc/my.cnf.



EOF

  exit(0);

}