Commit 0ac24179 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 9f90eb30 52683755

acinclude.m4

+4 −7
Original line number Diff line number Diff line
@@ -241,13 +241,10 @@ dnl ZLIB_LIBS (i. e. -L/path/to/zlib/lib -lz). 
AC_DEFUN([MYSQL_CHECK_ZLIB_WITH_COMPRESS], [

AC_MSG_CHECKING([for zlib compression library])

case $SYSTEM_TYPE in

dnl  This is a quick fix for Netware if AC_TRY_LINK for some reason 

dnl  won't work there. Uncomment in case of failure and on Netware

dnl  we'll always assume that zlib is present 

dnl  *netware* | *modesto*)

dnl     AC_MSG_RESULT(ok)

dnl     AC_DEFINE([HAVE_COMPRESS], [1], [Define to enable compression support])

dnl    ;;

*netware* | *modesto*)

     AC_MSG_RESULT(ok)

     AC_DEFINE([HAVE_COMPRESS], [1], [Define to enable compression support])

    ;;

  *)

    AC_ARG_WITH([zlib-dir],

                AC_HELP_STRING([--with-zlib-dir=DIR],

innobase/include/srv0srv.h

+3 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ extern os_event_t srv_lock_timeout_thread_event; 


/* If the last data file is auto-extended, we add this many pages to it

at a time */

#define SRV_AUTO_EXTEND_INCREMENT   (8 * ((1024 * 1024) / UNIV_PAGE_SIZE))

#define SRV_AUTO_EXTEND_INCREMENT	\

	(srv_auto_extend_increment * ((1024 * 1024) / UNIV_PAGE_SIZE))



/* This is set to TRUE if the MySQL user has set it in MySQL */

extern ibool	srv_lower_case_table_names;
@@ -51,6 +52,7 @@ extern ulint* srv_data_file_is_raw_partition; 


extern ibool	srv_auto_extend_last_data_file;

extern ulint	srv_last_file_size_max;

extern ulint	srv_auto_extend_increment;



extern ibool	srv_created_new_raw;

innobase/srv/srv0srv.c

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ ulint srv_last_file_size_max = 0; /* if != 0, this tells 
						 the max size auto-extending

						 may increase the last data

						 file size */

ulint	srv_auto_extend_increment = 8;		 /* If the last data file is

						 auto-extended, we add this

						 many pages to it at a time */

ulint*  srv_data_file_is_raw_partition = NULL;



/* If the following is TRUE we do not allow inserts etc. This protects

mysql-test/r/func_compress.result

+3 −3
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 length(compress(repeat('aaaaaaaaaa', 10000000)));

length(compress(repeat('aaaaaaaaaa', 10000000)))

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

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

0

mysql-test/r/multi_update.result

+7 −0
Original line number Diff line number Diff line
@@ -455,3 +455,10 @@ create table t3 (a int, primary key (a)); 
delete t1,t3 from t1,t2 where t1.a=t2.a and t2.a=(select t3.a from t3 where t1.a=t3.a);

ERROR 42S02: Unknown table 't3' in MULTI DELETE

drop table t1, t2, t3;

create table t1 (col1 int);

create table t2 (col1 int);

update t1,t2 set t1.col1 = (select max(col1) from t1) where t1.col1 = t2.col1;

ERROR HY000: You can't specify target table 't1' for update in FROM clause

delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1;

ERROR HY000: You can't specify target table 't1' for update in FROM clause

drop table t1,t2;