Commit 8b244fc6 authored by unknown's avatar unknown
Browse files

merged 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/slave.cc:
  Auto merged
mysql-test/r/select.result:
  !bk-eb
mysql-test/t/select.test:
  !bk-eb
parents 4c9c3f32 1b898a22

configure.in

+3 −1
Original line number Diff line number Diff line
@@ -1933,9 +1933,11 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ 
#

#

case "$target" in

 *-*-aix4*)

 *-*-aix4* | *-*-sco*)

	# (grr) aix 4.3 has a stub for clock_gettime, (returning ENOSYS)

	# and using AC_TRY_RUN is hard when cross-compiling

	# We also disable for SCO for the time being, the headers for the

	# thread library we use conflicts with other headers.

    ;;

 *) AC_CHECK_FUNCS(clock_gettime)

    ;;

innobase/srv/srv0srv.c

+7 −5
Original line number Diff line number Diff line
@@ -1783,11 +1783,13 @@ srv_lock_timeout_and_monitor_thread( 
		srv_printf_innodb_monitor(stderr);

	    }



	    if (srv_innodb_status) {

		mutex_enter(&srv_monitor_file_mutex);

		rewind(srv_monitor_file);

		srv_printf_innodb_monitor(srv_monitor_file);

		os_file_set_eof(srv_monitor_file);

		mutex_exit(&srv_monitor_file_mutex);

	    }



	    if (srv_print_innodb_tablespace_monitor

		&& difftime(current_time, last_table_monitor_time) > 60) {

mysql-test/r/func_compress.result

+2 −2
Original line number Diff line number Diff line
@@ -69,6 +69,6 @@ Error 1259 ZLIB: Input data corrupted 
Error	1256	Uncompressed data size too large; the maximum size is 1048576 (probably, length of uncompressed data was corrupted)

drop table t1;

set @@max_allowed_packet=1048576*100;

select compress(repeat('aaaaaaaaaa', 10000000)) is null;

compress(repeat('aaaaaaaaaa', 10000000)) is null

select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null;

compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null

0

mysql-test/r/select.result

+21 −3
Original line number Diff line number Diff line
@@ -2321,6 +2321,27 @@ select * from t2,t3 where t2.s = t3.s; 
s	s

two		two	

drop table t1, t2, t3;

create table t1 (a integer,  b integer, index(a), index(b));

create table t2 (c integer,  d integer, index(c), index(d));

insert into t1 values (1,2), (2,2), (3,2), (4,2);

insert into t2 values (1,3), (2,3), (3,4), (4,4);

explain select * from t1 left join t2 on a=c where d in (4);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	c,d	d	5	const	2	Using where

1	SIMPLE	t1	ALL	a	NULL	NULL	NULL	3	Using where

select * from t1 left join t2 on a=c where d in (4);

a	b	c	d

3	2	3	4

4	2	4	4

explain select * from t1 left join t2 on a=c where d = 4;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	c,d	d	5	const	2	Using where

1	SIMPLE	t1	ALL	a	NULL	NULL	NULL	3	Using where

select * from t1 left join t2 on a=c where d = 4;

a	b	c	d

3	2	3	4

4	2	4	4

drop table t1, t2;

CREATE TABLE t1 (

i int(11) NOT NULL default '0',

c char(10) NOT NULL default '',
@@ -2333,9 +2354,6 @@ INSERT INTO t1 VALUES (3,'c'); 
EXPLAIN SELECT i FROM t1 WHERE i=1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	const	PRIMARY	PRIMARY	4	const	1	Using index

EXPLAIN SELECT i FROM t1 WHERE i=1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	const	PRIMARY	PRIMARY	4	const	1	Using index

DROP TABLE t1;

CREATE TABLE t1 ( 

K2C4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '',

mysql-test/t/func_compress.test

+4 −1
Original line number Diff line number Diff line
@@ -38,7 +38,10 @@ drop table t1; 


#

# Bug #5497: a problem with large strings

# note that when LOW_MEMORY is set the "test" below is meaningless

#



set @@max_allowed_packet=1048576*100;

select compress(repeat('aaaaaaaaaa', 10000000)) is null;
 
--replace_result "''" XXX "'1'" XXX

eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null;