bk commit into 5.0 tree (iggy:1.2277)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.0 repository of Administrator. When Administrator does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-17 11:52:24-04:00, iggy@amd64. +4 -0
  Disable Server optimizations example.  This changeset as-is will not be pushed and it only an example.

  innobase/CMakeLists.txt@stripped, 2006-10-17 11:52:20-04:00, iggy@amd64. +39 -0
    Disabled Compiler Optimizations for innodb/* by explicitly naming each file included in the project.

  mysql-test/r/bug19424.result@stripped, 2006-10-17 11:52:20-04:00, iggy@amd64. +10 -0
    Sample results

  mysql-test/r/bug19424.result@stripped, 2006-10-17 11:52:20-04:00, iggy@amd64. +0 -0

  mysql-test/t/bug19424-master.opt@stripped, 2006-10-17 11:52:20-04:00, iggy@amd64. +1 -0
    Sets the innodb specific options for recreating the problem.

  mysql-test/t/bug19424-master.opt@stripped, 2006-10-17 11:52:20-04:00, iggy@amd64. +0 -0

  mysql-test/t/bug19424.test@stripped, 2006-10-17 11:52:21-04:00, iggy@amd64. +11 -0
    Sample test that creates the server crash.  Note, this test requires bug19424.sql which is not included in this changeset 
    due to it's size.  See bug report for instructions for obtaining test data.
    

  mysql-test/t/bug19424.test@stripped, 2006-10-17 11:52:21-04:00, iggy@amd64. +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	amd64.
# Root:	D:/src/mysql-5.0-maint_bug19424

--- 1.1/innobase/CMakeLists.txt	2006-10-17 11:52:33 -04:00
+++ 1.2/innobase/CMakeLists.txt	2006-10-17 11:52:33 -04:00
@@ -2,6 +2,40 @@
 #SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
 ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)
 
+IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
+	SET_SOURCE_FILES_PROPERTIES(btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c 
+							 buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c 
+							 data/data0data.c data/data0type.c 
+							 dict/dict0boot.c dict/dict0crea.c dict/dict0dict.c dict/dict0load.c dict/dict0mem.c 
+							 dyn/dyn0dyn.c 
+							 eval/eval0eval.c eval/eval0proc.c 
+							 fil/fil0fil.c 
+							 fsp/fsp0fsp.c
+							 fut/fut0fut.c fut/fut0lst.c 
+							 ha/ha0ha.c ha/hash0hash.c 
+							 ibuf/ibuf0ibuf.c 
+							 pars/lexyy.c pars/pars0grm.c pars/pars0opt.c pars/pars0pars.c pars/pars0sym.c 
+							 lock/lock0lock.c
+							 log/log0log.c log/log0recv.c 
+							 mach/mach0data.c 
+							 mem/mem0mem.c mem/mem0pool.c 
+							 mtr/mtr0log.c mtr/mtr0mtr.c 
+							 os/os0file.c os/os0proc.c os/os0sync.c os/os0thread.c 
+							 page/page0cur.c page/page0page.c 
+							 que/que0que.c 
+							 read/read0read.c 
+							 rem/rem0cmp.c rem/rem0rec.c
+							 row/row0ins.c row/row0mysql.c row/row0purge.c row/row0row.c row/row0sel.c row/row0uins.c 
+							 row/row0umod.c row/row0undo.c row/row0upd.c row/row0vers.c 
+							 srv/srv0que.c srv/srv0srv.c srv/srv0start.c 
+							 sync/sync0arr.c sync/sync0rw.c sync/sync0sync.c 
+							 thr/thr0loc.c 
+							 trx/trx0purge.c trx/trx0rec.c trx/trx0roll.c trx/trx0rseg.c trx/trx0sys.c trx/trx0trx.c trx/trx0undo.c 
+							 usr/usr0sess.c 
+							 ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c
+								PROPERTIES COMPILE_FLAGS -Od)
+ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
+
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include include)
 ADD_LIBRARY(innobase btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c 
 					 buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c 
@@ -33,3 +67,8 @@
 					 trx/trx0purge.c trx/trx0rec.c trx/trx0roll.c trx/trx0rseg.c trx/trx0sys.c trx/trx0trx.c trx/trx0undo.c 
 					 usr/usr0sess.c 
 					 ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c )
+
+IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
+	SET_TARGET_PROPERTIES(innobase
+						PROPERTIES COMPILE_FLAGS "/Od")
+ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
--- New file ---
+++ mysql-test/r/bug19424.result	06/10/17 11:52:20
SET GLOBAL table_cache = 4096;
SELECT @@table_cache;
@@table_cache
4096
SHOW VARIABLES LIKE 'innodb_additional_mem_pool_size';
Variable_name	Value
innodb_additional_mem_pool_size	16777216
USE test;
delete from outgoinglog;
drop table outgoinglog;

--- New file ---
+++ mysql-test/t/bug19424-master.opt	06/10/17 11:52:20
--innodb_additional_mem_pool_size=16M

--- New file ---
+++ mysql-test/t/bug19424.test	06/10/17 11:52:21
SET GLOBAL table_cache = 4096;
SELECT @@table_cache;
SHOW VARIABLES LIKE 'innodb_additional_mem_pool_size';

--exec $MYSQL < $MYSQLTEST_VARDIR/std_data_ln/bug19424.sql;

USE test;

delete from outgoinglog;

drop table outgoinglog;