Commit a701afe2 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 

into gw.mysql.r18.ru:/usr/home/ram/work/4.0
parents 3487cba7 30025f3f

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1632,12 +1632,12 @@ if test "$with_debug" = "yes" 
then

  # Medium debug.

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS"

elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

innobase/include/srv0srv.h

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,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;
@@ -49,6 +50,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
@@ -86,6 +86,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/rpl_multi_update2.result

0 → 100644
+42 −0
Original line number Diff line number Diff line 
slave stop;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

slave start;

CREATE TABLE t1 (

a int unsigned not null auto_increment primary key,

b int unsigned

) TYPE=MyISAM;

CREATE TABLE t2 (

a int unsigned not null auto_increment primary key,

b int unsigned

) TYPE=MyISAM;

INSERT INTO t1 VALUES (NULL, 0);

INSERT INTO t1 SELECT NULL, 0 FROM t1;

INSERT INTO t2 VALUES (NULL, 0), (NULL,1);

SELECT * FROM t1 ORDER BY a;

a	b

1	0

2	0

SELECT * FROM t2 ORDER BY a;

a	b

1	0

2	1

UPDATE t1, t2 SET t1.b = (t2.b+4) WHERE t1.a = t2.a;

SELECT * FROM t1 ORDER BY a;

a	b

1	4

2	5

SELECT * FROM t2 ORDER BY a;

a	b

1	0

2	1

SELECT * FROM t1 ORDER BY a;

a	b

1	4

2	5

SELECT * FROM t2 ORDER BY a;

a	b

1	0

2	1

mysql-test/t/rpl_multi_update2-slave.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--replicate-ignore-table=nothing.sensible