Sergey Vojtovich f24dd341da Applying InnoDB plugin snashot ... Detailed revision comments: r6126 | vasil | 2009-10-30 10:36:07 +0200 (Fri, 30 Oct 2009) | 45 lines branches/zip: Merge r6112:6125 from branches/5.1: (skipping r6122 and r6123, Jimmy says these are already present and need not be merged): ------------------------------------------------------------------------ r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug44369.result M /branches/5.1/mysql-test/innodb_bug44369.test M /branches/5.1/mysql-test/innodb_bug46000.result M /branches/5.1/mysql-test/innodb_bug46000.test branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN for push_warning_printf() call in innodb. Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR) rb://170 approved by Marko. ------------------------------------------------------------------------ r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines Changed paths: M /branches/5.1/os/os0proc.c branches/5.1: In os_mem_alloc_large(), if we fail to attach the shared memory, reset memory pointer ptr to NULL, and allocate memory from conventional pool. This is a port from branches/zip. Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect rb://198 Approved by: Marko ------------------------------------------------------------------------ r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: White-space fixup. ------------------------------------------------------------------------		2009-11-03 14:34:38 +04:00
..
btr
buf	Applying InnoDB plugin snashot	2009-11-03 14:26:07 +04:00
data
dict
dyn
eval
fil	Applying InnoDB plugin snashot	2009-11-03 14:24:21 +04:00
fsp
fut
ha
handler	Applying InnoDB plugin snashot	2009-11-03 14:34:38 +04:00
ibuf
include	Applying InnoDB plugin snashot	2009-11-03 14:26:39 +04:00
lock
log
mach
mem
mtr
mysql-test
os	Applying InnoDB plugin snashot	2009-11-03 14:25:00 +04:00
page
pars
que
read
rem
row	Applying InnoDB plugin snashot	2009-11-03 14:32:33 +04:00
scripts
srv
sync
thr
trx
usr
ut
ChangeLog	Applying InnoDB plugin snashot	2009-11-03 14:34:03 +04:00
CMakeLists.txt
compile-innodb
compile-innodb-debug
COPYING
COPYING.Google
COPYING.Percona
COPYING.Sun_Microsystems
Doxyfile
ha_innodb.def
Makefile.am
plug.in
revert_gen.sh
setup.sh