mariadb

Commit Graph

Author	SHA1	Message	Date
Vasil Dimov	167b68fecb	Move everything into a subdirectory xyz/	16 years ago
mmakela	01f991351c	branches/zip: buf_flush_block_cmp(): Do not mix declarations and code. Stick to C90, because some build platforms are not C99 yet.	16 years ago
mmakela	3124fbadbb	branches/zip: buf_flush_block_cmp(): Do not mix declarations and code. Stick to C90, because some build platforms are not C99 yet.	16 years ago
irana	3ac3256773	branches/innodb+ rb://281 changes to mtr_commit: 1) grab log mutex (and do initial mtr commit stuff) for each dirty block 2) grab flush_list mutex 3) Insert into flush list 4) release flush_list mutex 5) release log_sys mutex Changed version: 1) grab log mutex (and do initial mtr commit stuff) 2) grab a new flushList order mutex 3) release log mutex for each dirty block 4) grab flush_list mutex 5) Insert into flush list 6) release flush_list mutex 7) Release new flush list order mutex Approved by: Marko has given the initial nod.	16 years ago
irana	47a4352ec2	branches/innodb+ rb://281 changes to mtr_commit: 1) grab log mutex (and do initial mtr commit stuff) for each dirty block 2) grab flush_list mutex 3) Insert into flush list 4) release flush_list mutex 5) release log_sys mutex Changed version: 1) grab log mutex (and do initial mtr commit stuff) 2) grab a new flushList order mutex 3) release log mutex for each dirty block 4) grab flush_list mutex 5) Insert into flush list 6) release flush_list mutex 7) Release new flush list order mutex Approved by: Marko has given the initial nod.	16 years ago
Vasil Dimov	5107604b02	Move everything into a subdir in order to workaround a bzr merge bug: https://bugs.launchpad.net/bzr/+bug/375898	16 years ago
Vasil Dimov	c75d70fdc4	Move everything into a subdir in order to workaround a bzr merge bug: https://bugs.launchpad.net/bzr/+bug/375898	16 years ago
mmakela	d08cd430ba	branches/innodb+: Merge revisions 6853:6897 from branches/zip: Skip r6860, which was merged from branches/innodb+ to branches/zip, and r6857, which is only applicable to branches/zip. ------------------------------------------------------------------------ r6858 \| mmakela \| 2010-03-23 14:09:24 +0200 (Tue, 23 Mar 2010) \| 1 line Changed paths: M /branches/zip/handler/ha_innodb.cc branches/zip: innodb_read_ahead_threshold: Add missing space to help string. ------------------------------------------------------------------------ r6861 \| vdimov \| 2010-03-23 19:31:02 +0200 (Tue, 23 Mar 2010) \| 36 lines Changed paths: M /branches/zip/trx/trx0i_s.c branches/zip: Merge joerg@mysql.com-20100322150231-vdq0afbqtmbs6phy from BZR, Including univ.i before mysql/plugin.h is needed to avoid this compiler error: o This is how gcc puts it: o > > ccache /usr/local/gcc-4.3.2/bin/gcc -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib -g -O3 -march=i686 -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' \|\| echo './'`trx/trx0i_s.c o > > In file included from ./include/univ.i:114, o > > from trx/trx0i_s.c:36: o > > ../../include/my_pthread.h:628: error: expected ')' before '' token o > > In file included from ../../include/my_pthread.h:732, o > > from ./include/univ.i:114, o > > from trx/trx0i_s.c:36: o > > ../../include/mysql/psi/mysql_thread.h💯 error: expected specifier-qualifier-list before 'pthread_rwlock_t' o > > ../../include/mysql/psi/mysql_thread.h:116: error: expected specifier-qualifier-list before 'pthread_rwlock_t' o > > ../../include/mysql/psi/mysql_thread.h: In function 'inline_mysql_rwlock_init': o > > ../../include/mysql/psi/mysql_thread.h:711: error: 'mysql_rwlock_t' has no member named 'm_psi' o > > ../../include/mysql/psi/mysql_thread.h:716: error: 'mysql_rwlock_t' has no member named 'm_rwlock' o > > .... ((continued)) o o Intel's icc gives slightly clearer messages: o > > icc -static-intel -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib -O3 -g -unroll2 -ip -mp -restrict -no-ftz -no-prefetch -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' \|\| echo './'`trx/trx0i_s.c o > > ../../include/my_pthread.h(628): error: identifier "pthread_rwlock_t" is undefined o > > extern int rw_pr_init(rw_pr_lock_t ); o > > ^ o > > o > > ../../include/mysql/psi/mysql_thread.h(100): error: identifier "pthread_rwlock_t" is undefined o > > rw_lock_t m_rwlock; o > > ^ o > > o > > ../../include/mysql/psi/mysql_thread.h(116): error: identifier "pthread_rwlock_t" is undefined o > > rw_pr_lock_t m_prlock; o > > ^ ------------------------------------------------------------------------ r6864 \| mmakela \| 2010-03-24 14:05:53 +0200 (Wed, 24 Mar 2010) \| 1 line Changed paths: M /branches/zip/include/data0type.ic branches/zip: dtype_new_store_for_order_and_null_size(): Add ut_ad() on mtype. ------------------------------------------------------------------------ r6868 \| mmakela \| 2010-03-25 13:03:08 +0200 (Thu, 25 Mar 2010) \| 1 line Changed paths: M /branches/zip/page/page0page.c branches/zip: page_validate(): Check the buf[] bounds. ------------------------------------------------------------------------ r6871 \| vdimov \| 2010-03-25 16:39:44 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Whitespace fixup to be consistent with the rest of the file. ------------------------------------------------------------------------ r6872 \| vdimov \| 2010-03-25 17:03:17 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Fix ChangeLog - write only the bug title in bugs.mysql.com-related entires. ------------------------------------------------------------------------ r6873 \| vdimov \| 2010-03-25 17:06:56 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Use Bug#N instead of Bug #N to be consistent with the rest of the fil. ------------------------------------------------------------------------ r6874 \| vdimov \| 2010-03-25 17:17:52 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Wrap ChangeLog at 78th column ------------------------------------------------------------------------ r6875 \| vdimov \| 2010-03-25 18:18:15 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Wrap line at 78 column in ChangeLog. ------------------------------------------------------------------------ r6891 \| vdimov \| 2010-03-26 16:19:01 +0200 (Fri, 26 Mar 2010) \| 5 lines Changed paths: M /branches/innodb+/buf/buf0buddy.c M /branches/innodb+/include/btr0btr.ic M /branches/innodb+/include/buf0buf.ic M /branches/innodb+/include/handler0alter.h M /branches/innodb+/include/mtr0mtr.ic M /branches/innodb+/include/pars0pars.h M /branches/innodb+/include/row0merge.h M /branches/innodb+/include/row0row.h M /branches/innodb+/include/row0sel.h M /branches/innodb+/include/row0types.h M /branches/innodb+/include/sync0rw.h M /branches/innodb+/include/ut0lst.h M /branches/innodb+/include/ut0ut.h M /branches/innodb+/os/os0thread.c M /branches/innodb+/pars/pars0pars.c M /branches/innodb+/plug.in M /branches/innodb+/row/row0purge.c M /branches/innodb+/row/row0row.c M /branches/innodb+/row/row0uins.c M /branches/innodb+/trx/trx0rec.c M /branches/innodb+/ut/ut0ut.c M /branches/innodb+_persistent_stats/buf/buf0buddy.c M /branches/innodb+_persistent_stats/include/btr0btr.ic M /branches/innodb+_persistent_stats/include/buf0buf.ic M /branches/innodb+_persistent_stats/include/handler0alter.h M /branches/innodb+_persistent_stats/include/mtr0mtr.ic M /branches/innodb+_persistent_stats/include/row0merge.h M /branches/innodb+_persistent_stats/include/row0row.h M /branches/innodb+_persistent_stats/include/row0sel.h M /branches/innodb+_persistent_stats/include/row0types.h M /branches/innodb+_persistent_stats/include/sync0rw.h M /branches/innodb+_persistent_stats/os/os0thread.c M /branches/innodb+_persistent_stats/plug.in M /branches/innodb+_persistent_stats/row/row0purge.c M /branches/innodb+_persistent_stats/row/row0row.c M /branches/innodb+_persistent_stats/row/row0uins.c M /branches/innodb+_persistent_stats/trx/trx0rec.c M /branches/performance_schema/buf/buf0buddy.c M /branches/performance_schema/buf/buf0flu.c M /branches/performance_schema/compile-innodb-debug M /branches/performance_schema/include/btr0btr.ic M /branches/performance_schema/include/buf0buf.ic M /branches/performance_schema/include/dict0boot.ic M /branches/performance_schema/include/dict0dict.h M /branches/performance_schema/include/os0file.ic M /branches/performance_schema/include/os0thread.h M /branches/performance_schema/include/row0sel.h M /branches/performance_schema/include/trx0purge.h M /branches/performance_schema/include/trx0sys.ic M /branches/performance_schema/include/ut0wqueue.h M /branches/performance_schema/lock/lock0iter.c M /branches/performance_schema/mem/mem0pool.c M /branches/performance_schema/os/os0thread.c M /branches/performance_schema/page/page0zip.c M /branches/performance_schema/que/que0que.c M /branches/performance_schema/read/read0read.c M /branches/performance_schema/row/row0purge.c M /branches/performance_schema/row/row0row.c M /branches/performance_schema/row/row0vers.c M /branches/performance_schema/sync/sync0arr.c M /branches/performance_schema/thr/thr0loc.c M /branches/performance_schema/trx/trx0rec.c M /branches/performance_schema/trx/trx0roll.c M /branches/performance_schema/trx/trx0undo.c M /branches/performance_schema/ut/ut0wqueue.c M /branches/perfschema/btr/btr0sea.c M /branches/perfschema/buf/buf0buddy.c M /branches/perfschema/buf/buf0flu.c M /branches/perfschema/compile-innodb-debug M /branches/perfschema/ha/hash0hash.c M /branches/perfschema/include/buf0buf.ic M /branches/perfschema/include/buf0flu.ic M /branches/perfschema/include/dict0boot.ic M /branches/perfschema/include/os0thread.h M /branches/perfschema/include/sync0rw.h M /branches/perfschema/include/sync0rw.ic M /branches/perfschema/include/sync0sync.ic M /branches/perfschema/mem/mem0pool.c M /branches/perfschema/os/os0thread.c M /branches/perfschema/page/page0zip.c M /branches/perfschema/que/que0que.c M /branches/perfschema/read/read0read.c M /branches/perfschema/row/row0purge.c M /branches/perfschema/row/row0vers.c M /branches/perfschema/sync/sync0arr.c M /branches/perfschema/sync/sync0rw.c M /branches/perfschema/thr/thr0loc.c M /branches/perfschema/trx/trx0purge.c M /branches/perfschema/trx/trx0rec.c M /branches/perfschema/trx/trx0roll.c M /branches/perfschema/trx/trx0undo.c M /branches/perfschema/ut/ut0wqueue.c M /branches/zip/buf/buf0buddy.c M /branches/zip/buf/buf0flu.c M /branches/zip/buf/buf0rea.c M /branches/zip/fil/fil0fil.c M /branches/zip/include/btr0btr.ic M /branches/zip/include/buf0buf.ic M /branches/zip/include/buf0flu.h M /branches/zip/include/data0type.ic M /branches/zip/include/mtr0mtr.ic M /branches/zip/include/row0sel.h M /branches/zip/include/sync0rw.h M /branches/zip/plug.in M /branches/zip/row/row0row.c M /branches/zip/trx/trx0i_s.c M /branches/zip/trx/trx0rec.c M /branches/zip/trx/trx0sys.c Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD \|grep "^ M " \|cut -b 16- \|sort -u) ; do sed -i "" -E 's/(Copyright $c$ [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done ------------------------------------------------------------------------ r6897 \| mmakela \| 2010-03-29 11:36:19 +0300 (Mon, 29 Mar 2010) \| 3 lines Changed paths: M /branches/zip/handler/ha_innodb.cc branches/zip: innodb_mutex_show_status(): Fix a condition that was accidentally negated in r6781, making SHOW ENGINE INNODB MUTEX STATUS display only locks with no OS waits. ------------------------------------------------------------------------	16 years ago
mmakela	b7188cd26b	branches/innodb+: Merge revisions 6853:6897 from branches/zip: Skip r6860, which was merged from branches/innodb+ to branches/zip, and r6857, which is only applicable to branches/zip. ------------------------------------------------------------------------ r6858 \| mmakela \| 2010-03-23 14:09:24 +0200 (Tue, 23 Mar 2010) \| 1 line Changed paths: M /branches/zip/handler/ha_innodb.cc branches/zip: innodb_read_ahead_threshold: Add missing space to help string. ------------------------------------------------------------------------ r6861 \| vdimov \| 2010-03-23 19:31:02 +0200 (Tue, 23 Mar 2010) \| 36 lines Changed paths: M /branches/zip/trx/trx0i_s.c branches/zip: Merge joerg@mysql.com-20100322150231-vdq0afbqtmbs6phy from BZR, Including univ.i before mysql/plugin.h is needed to avoid this compiler error: o This is how gcc puts it: o > > ccache /usr/local/gcc-4.3.2/bin/gcc -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib -g -O3 -march=i686 -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' \|\| echo './'`trx/trx0i_s.c o > > In file included from ./include/univ.i:114, o > > from trx/trx0i_s.c:36: o > > ../../include/my_pthread.h:628: error: expected ')' before '' token o > > In file included from ../../include/my_pthread.h:732, o > > from ./include/univ.i:114, o > > from trx/trx0i_s.c:36: o > > ../../include/mysql/psi/mysql_thread.h💯 error: expected specifier-qualifier-list before 'pthread_rwlock_t' o > > ../../include/mysql/psi/mysql_thread.h:116: error: expected specifier-qualifier-list before 'pthread_rwlock_t' o > > ../../include/mysql/psi/mysql_thread.h: In function 'inline_mysql_rwlock_init': o > > ../../include/mysql/psi/mysql_thread.h:711: error: 'mysql_rwlock_t' has no member named 'm_psi' o > > ../../include/mysql/psi/mysql_thread.h:716: error: 'mysql_rwlock_t' has no member named 'm_rwlock' o > > .... ((continued)) o o Intel's icc gives slightly clearer messages: o > > icc -static-intel -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib -O3 -g -unroll2 -ip -mp -restrict -no-ftz -no-prefetch -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' \|\| echo './'`trx/trx0i_s.c o > > ../../include/my_pthread.h(628): error: identifier "pthread_rwlock_t" is undefined o > > extern int rw_pr_init(rw_pr_lock_t ); o > > ^ o > > o > > ../../include/mysql/psi/mysql_thread.h(100): error: identifier "pthread_rwlock_t" is undefined o > > rw_lock_t m_rwlock; o > > ^ o > > o > > ../../include/mysql/psi/mysql_thread.h(116): error: identifier "pthread_rwlock_t" is undefined o > > rw_pr_lock_t m_prlock; o > > ^ ------------------------------------------------------------------------ r6864 \| mmakela \| 2010-03-24 14:05:53 +0200 (Wed, 24 Mar 2010) \| 1 line Changed paths: M /branches/zip/include/data0type.ic branches/zip: dtype_new_store_for_order_and_null_size(): Add ut_ad() on mtype. ------------------------------------------------------------------------ r6868 \| mmakela \| 2010-03-25 13:03:08 +0200 (Thu, 25 Mar 2010) \| 1 line Changed paths: M /branches/zip/page/page0page.c branches/zip: page_validate(): Check the buf[] bounds. ------------------------------------------------------------------------ r6871 \| vdimov \| 2010-03-25 16:39:44 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Whitespace fixup to be consistent with the rest of the file. ------------------------------------------------------------------------ r6872 \| vdimov \| 2010-03-25 17:03:17 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Fix ChangeLog - write only the bug title in bugs.mysql.com-related entires. ------------------------------------------------------------------------ r6873 \| vdimov \| 2010-03-25 17:06:56 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Use Bug#N instead of Bug #N to be consistent with the rest of the fil. ------------------------------------------------------------------------ r6874 \| vdimov \| 2010-03-25 17:17:52 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Wrap ChangeLog at 78th column ------------------------------------------------------------------------ r6875 \| vdimov \| 2010-03-25 18:18:15 +0200 (Thu, 25 Mar 2010) \| 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip: Wrap line at 78 column in ChangeLog. ------------------------------------------------------------------------ r6891 \| vdimov \| 2010-03-26 16:19:01 +0200 (Fri, 26 Mar 2010) \| 5 lines Changed paths: M /branches/innodb+/buf/buf0buddy.c M /branches/innodb+/include/btr0btr.ic M /branches/innodb+/include/buf0buf.ic M /branches/innodb+/include/handler0alter.h M /branches/innodb+/include/mtr0mtr.ic M /branches/innodb+/include/pars0pars.h M /branches/innodb+/include/row0merge.h M /branches/innodb+/include/row0row.h M /branches/innodb+/include/row0sel.h M /branches/innodb+/include/row0types.h M /branches/innodb+/include/sync0rw.h M /branches/innodb+/include/ut0lst.h M /branches/innodb+/include/ut0ut.h M /branches/innodb+/os/os0thread.c M /branches/innodb+/pars/pars0pars.c M /branches/innodb+/plug.in M /branches/innodb+/row/row0purge.c M /branches/innodb+/row/row0row.c M /branches/innodb+/row/row0uins.c M /branches/innodb+/trx/trx0rec.c M /branches/innodb+/ut/ut0ut.c M /branches/innodb+_persistent_stats/buf/buf0buddy.c M /branches/innodb+_persistent_stats/include/btr0btr.ic M /branches/innodb+_persistent_stats/include/buf0buf.ic M /branches/innodb+_persistent_stats/include/handler0alter.h M /branches/innodb+_persistent_stats/include/mtr0mtr.ic M /branches/innodb+_persistent_stats/include/row0merge.h M /branches/innodb+_persistent_stats/include/row0row.h M /branches/innodb+_persistent_stats/include/row0sel.h M /branches/innodb+_persistent_stats/include/row0types.h M /branches/innodb+_persistent_stats/include/sync0rw.h M /branches/innodb+_persistent_stats/os/os0thread.c M /branches/innodb+_persistent_stats/plug.in M /branches/innodb+_persistent_stats/row/row0purge.c M /branches/innodb+_persistent_stats/row/row0row.c M /branches/innodb+_persistent_stats/row/row0uins.c M /branches/innodb+_persistent_stats/trx/trx0rec.c M /branches/performance_schema/buf/buf0buddy.c M /branches/performance_schema/buf/buf0flu.c M /branches/performance_schema/compile-innodb-debug M /branches/performance_schema/include/btr0btr.ic M /branches/performance_schema/include/buf0buf.ic M /branches/performance_schema/include/dict0boot.ic M /branches/performance_schema/include/dict0dict.h M /branches/performance_schema/include/os0file.ic M /branches/performance_schema/include/os0thread.h M /branches/performance_schema/include/row0sel.h M /branches/performance_schema/include/trx0purge.h M /branches/performance_schema/include/trx0sys.ic M /branches/performance_schema/include/ut0wqueue.h M /branches/performance_schema/lock/lock0iter.c M /branches/performance_schema/mem/mem0pool.c M /branches/performance_schema/os/os0thread.c M /branches/performance_schema/page/page0zip.c M /branches/performance_schema/que/que0que.c M /branches/performance_schema/read/read0read.c M /branches/performance_schema/row/row0purge.c M /branches/performance_schema/row/row0row.c M /branches/performance_schema/row/row0vers.c M /branches/performance_schema/sync/sync0arr.c M /branches/performance_schema/thr/thr0loc.c M /branches/performance_schema/trx/trx0rec.c M /branches/performance_schema/trx/trx0roll.c M /branches/performance_schema/trx/trx0undo.c M /branches/performance_schema/ut/ut0wqueue.c M /branches/perfschema/btr/btr0sea.c M /branches/perfschema/buf/buf0buddy.c M /branches/perfschema/buf/buf0flu.c M /branches/perfschema/compile-innodb-debug M /branches/perfschema/ha/hash0hash.c M /branches/perfschema/include/buf0buf.ic M /branches/perfschema/include/buf0flu.ic M /branches/perfschema/include/dict0boot.ic M /branches/perfschema/include/os0thread.h M /branches/perfschema/include/sync0rw.h M /branches/perfschema/include/sync0rw.ic M /branches/perfschema/include/sync0sync.ic M /branches/perfschema/mem/mem0pool.c M /branches/perfschema/os/os0thread.c M /branches/perfschema/page/page0zip.c M /branches/perfschema/que/que0que.c M /branches/perfschema/read/read0read.c M /branches/perfschema/row/row0purge.c M /branches/perfschema/row/row0vers.c M /branches/perfschema/sync/sync0arr.c M /branches/perfschema/sync/sync0rw.c M /branches/perfschema/thr/thr0loc.c M /branches/perfschema/trx/trx0purge.c M /branches/perfschema/trx/trx0rec.c M /branches/perfschema/trx/trx0roll.c M /branches/perfschema/trx/trx0undo.c M /branches/perfschema/ut/ut0wqueue.c M /branches/zip/buf/buf0buddy.c M /branches/zip/buf/buf0flu.c M /branches/zip/buf/buf0rea.c M /branches/zip/fil/fil0fil.c M /branches/zip/include/btr0btr.ic M /branches/zip/include/buf0buf.ic M /branches/zip/include/buf0flu.h M /branches/zip/include/data0type.ic M /branches/zip/include/mtr0mtr.ic M /branches/zip/include/row0sel.h M /branches/zip/include/sync0rw.h M /branches/zip/plug.in M /branches/zip/row/row0row.c M /branches/zip/trx/trx0i_s.c M /branches/zip/trx/trx0rec.c M /branches/zip/trx/trx0sys.c Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD \|grep "^ M " \|cut -b 16- \|sort -u) ; do sed -i "" -E 's/(Copyright $c$ [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done ------------------------------------------------------------------------ r6897 \| mmakela \| 2010-03-29 11:36:19 +0300 (Mon, 29 Mar 2010) \| 3 lines Changed paths: M /branches/zip/handler/ha_innodb.cc branches/zip: innodb_mutex_show_status(): Fix a condition that was accidentally negated in r6781, making SHOW ENGINE INNODB MUTEX STATUS display only locks with no OS waits. ------------------------------------------------------------------------	16 years ago
vdimov	6f8ba74582	Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD \|grep "^ M " \|cut -b 16- \|sort -u) ; do sed -i "" -E 's/(Copyright $c$ [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done	16 years ago
vdimov	c31479b5f2	Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD \|grep "^ M " \|cut -b 16- \|sort -u) ; do sed -i "" -E 's/(Copyright $c$ [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done	16 years ago
jyang	763d9625f9	branches/zip: This is patch from Inaam that uses red-black tree to speed up insertions into the flush_list and thus the recovery process. The patch has been tested by Nokia.	16 years ago
jyang	38d926a8d0	branches/zip: This is patch from Inaam that uses red-black tree to speed up insertions into the flush_list and thus the recovery process. The patch has been tested by Nokia.	16 years ago
Aleksandr Kuzminsky	488cc63ab1	Sync with rev. 152 of extensions-1.0.6	16 years ago
Aleksandr Kuzminsky	903287c123	Sync with extensions-1.0.6 Revision 137	16 years ago
Aleksandr Kuzminsky	5b0ab60a4b	Synced with extensions-1.0.6 Rev. 135	16 years ago
inaam	a52c4820a3	branches/innodb+ rb://210 Introduce a new mutex to protect flush_list. Redesign mtr_commit() in a way that log_sys mutex is not held while all mtr_memos are popped and is released just after the modified blocks are inserted into the flush_list. This should reduce contention on log_sys mutex. Approved by: Heikki	16 years ago
inaam	626d26f351	branches/innodb+ rb://210 Introduce a new mutex to protect flush_list. Redesign mtr_commit() in a way that log_sys mutex is not held while all mtr_memos are popped and is released just after the modified blocks are inserted into the flush_list. This should reduce contention on log_sys mutex. Approved by: Heikki	16 years ago
Aleksandr Kuzminsky	4819f65a8b	Sync with rev. 114	16 years ago
sunny	37312683cc	branches/innodb+: Merge revisions r5971:6130 from branches/zip. ------------------------------------------------------------------------ r5971 \| marko \| 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) \| 2 lines branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup when the pwrite system call is not available. ------------------------------------------------------------------------ r5972 \| marko \| 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) \| 5 lines branches/zip: fil_node_open_file(): In InnoDB Hot Backup, determine the page size of single-file tablespaces before computing the file node size. Otherwise, the space->size of compressed tablespaces would be computed with UNIV_PAGE_SIZE instead of key_block_size. This should fix Issue #313. ------------------------------------------------------------------------ r5973 \| marko \| 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) \| 2 lines branches/zip: recv_add_to_hash_table(): Simplify obfuscated pointer arithmetics. ------------------------------------------------------------------------ r5978 \| marko \| 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) \| 1 line branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined. ------------------------------------------------------------------------ r5979 \| marko \| 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) \| 4 lines branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary. This preprocessor symbol has been recently introduced in MySQL 5.1. The InnoDB Plugin should remain source compatible with MySQL 5.1.24 and later. ------------------------------------------------------------------------ r5988 \| calvin \| 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) \| 8 lines branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA 1453 (0x5AD) for InnoDB backend When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES occurs, yields for 100ms and retries the operation. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r5992 \| vasil \| 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) \| 4 lines branches/zip: Add ChangeLog entry for c5988. ------------------------------------------------------------------------ r5994 \| marko \| 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) \| 17 lines branches/zip: Try to prevent the reuse of tablespace identifiers after InnoDB has crashed during table creation. Also, refuse to start if files with duplicate tablespace identifiers are encountered. fil_node_create(): Update fil_system->max_assigned_id. This should prevent the reuse of a space->id when InnoDB does a full crash recovery and invokes fil_load_single_table_tablespaces(). Normally, fil_system->max_assigned_id is initialized from SELECT MAX(ID) FROM SYS_TABLES. fil_open_single_table_tablespace(): Return FALSE when fil_space_create() fails. fil_load_single_table_tablespace(): Exit if fil_space_create() fails and innodb_force_recovery=0. rb://173 approved by Heikki Tuuri. This addresses Issue #335. ------------------------------------------------------------------------ r5995 \| marko \| 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) \| 17 lines branches/zip: Do not write to PAGE_INDEX_ID after page creation, not even when restoring an uncompressed page after a compression failure. btr_page_reorganize_low(): On compression failure, do not restore those page header fields that should not be affected by the reorganization. Instead, compare the fields. page_zip_decompress(): Add the parameter ibool all, for copying all page header fields. Pass the parameter all=TRUE on block read completion, redo log application, and page_zip_validate(); pass all=FALSE in all other cases. page_zip_reorganize(): Do not restore the uncompressed page on failure. It will be restored (to pre-modification state) by the caller anyway. rb://167, Issue #346 ------------------------------------------------------------------------ r5996 \| marko \| 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) \| 4 lines branches/zip: Address Issue #350 in comments. lock_rec_queue_validate(), lock_rec_queue_validate(): Note that this debug code may violate the latching order and cause deadlocks. ------------------------------------------------------------------------ r5997 \| marko \| 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) \| 12 lines branches/zip: Remove an assertion failure when the InnoDB data dictionary is inconsistent with the MySQL .frm file. ha_innobase::index_read(): When the index cannot be found, return an error. ha_innobase::change_active_index(): When prebuilt->index == NULL, set also prebuilt->index_usable = FALSE. This is not needed for correctness, because prebuilt->index_usable is only checked by row_search_for_mysql(), which requires prebuilt->index != NULL. This addresses Issue #349. Approved by Heikki Tuuri over IM. ------------------------------------------------------------------------ r6005 \| vasil \| 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) \| 4 lines branches/zip: ChangeLog: wrap around 78th column, not earlier. ------------------------------------------------------------------------ r6006 \| vasil \| 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) \| 4 lines branches/zip: Add ChangeLog entry for the release of 1.0.4. ------------------------------------------------------------------------ r6007 \| vasil \| 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) \| 6 lines branches/zip: Fix the year, should be 2009. Pointed by: Calvin ------------------------------------------------------------------------ r6026 \| marko \| 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) \| 1 line branches/zip: Add some debug assertions for checking FSEG_MAGIC_N. ------------------------------------------------------------------------ r6028 \| marko \| 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) \| 3 lines branches/zip: recv_no_log_write: New debug flag for tracking down Mantis Issue #347. No modifications should be made to the database while recv_apply_hashed_log_recs() is about to complete. ------------------------------------------------------------------------ r6029 \| calvin \| 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) \| 4 lines branches/zip: non-functional changes Fix typo. ------------------------------------------------------------------------ r6031 \| marko \| 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) \| 49 lines branches/zip: Clean up after a crash during DROP INDEX. When InnoDB crashes while dropping an index, ensure that the index will be completely dropped during crash recovery. row_merge_drop_index(): Before dropping an index, rename the index to start with TEMP_INDEX_PREFIX_STR and commit the change, so that row_merge_drop_temp_indexes() will drop the index after crash recovery if the server crashes while dropping the index. fseg_inode_try_get(): New function, forked from fseg_inode_get(). Return NULL if the file segment index node is free. fseg_inode_get(): Assert that the file segment index node is not free. fseg_free_step(): If the file segment index node is already free, print a diagnostic message and return TRUE. fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that allocated-and-freed file segment index nodes can be better distinguished from uninitialized ones. This is rb://174, addressing Issue #348. Tested by restarting mysqld upon the completion of the added log_write_up_to() invocation below, during DROP INDEX. The index was dropped after crash recovery, and re-issuing the DROP INDEX did not crash the server. Index: btr/btr0btr.c =================================================================== --- btr/btr0btr.c (revision 6026) +++ btr/btr0btr.c (working copy) @@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri #include "ibuf0ibuf.h" #include "trx0trx.h" +#include "log0log.h" /* Latching strategy of the InnoDB B-tree -------------------------------------- @@ -873,6 +874,8 @@ leaf_loop: goto leaf_loop; } + + log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE); top_loop: mtr_start(&mtr); ------------------------------------------------------------------------ r6033 \| calvin \| 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) \| 4 lines branches/zip: fix a typo in error message Reported as bug#47763. ------------------------------------------------------------------------ r6043 \| inaam \| 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) \| 12 lines branches/zip rb://176 Do not invalidate buffer pool while an LRU batch is active. Added code to buf_pool_invalidate() to wait for the running batches to finish. This patch also resets the state of buf_pool struct at invalidation. This addresses the concern where buf_pool->freed_page_clock becomes non-zero because we read in a system tablespace page for file format info at startup. Approved by: Marko ------------------------------------------------------------------------ r6044 \| pekka \| 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) \| 5 lines branches/zip: Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP). This is part of the fix for Issue #186. Note! The Windows implementation is incomplete. ------------------------------------------------------------------------ r6046 \| pekka \| 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) \| 3 lines branches/zip: Revert r6044 which added os_file_is_same() function (issue#186). This functionality is moved to Hot Backup source tree. ------------------------------------------------------------------------ r6048 \| vasil \| 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) \| 16 lines branches/zip: When scanning a directory readdir() is called and stat() after it, if a file is deleted between the two calls stat will fail and the whole precedure will fail. Change this behavior to continue with the next entry if stat() fails because of nonexistent file. This is transparent change as it will make it look as if the file was deleted before the readdir() call. This change is needed in order to fix https://svn.innodb.com/mantis/view.php?id=174 in which we need to abort if os_file_readdir_next_file() encounters "real" errors. Approved by: Marko, Pekka (rb://177) ------------------------------------------------------------------------ r6049 \| vasil \| 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) \| 7 lines branches/zip: Fix compilation warning in Hot Backup: innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace': innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t' ------------------------------------------------------------------------ r6064 \| calvin \| 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) \| 4 lines branches/zip: non-functional changes Changes from MySQL to fix build issue. ------------------------------------------------------------------------ r6065 \| inaam \| 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) \| 7 lines branches/zip rb://182 Call fsync() on datafiles after a batch of pages is written to disk even when skip_innodb_doublewrite is set. Approved by: Heikki ------------------------------------------------------------------------ r6080 \| sunny \| 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) \| 3 lines branches/zip: Change page_mem_alloc_free() to inline. Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10 ------------------------------------------------------------------------ r6084 \| vasil \| 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) \| 4 lines branches/zip: Add ChangeLog entry for r6080. ------------------------------------------------------------------------ r6095 \| vasil \| 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) \| 7 lines branches/zip: Fix Bug#47808 innodb_information_schema.test fails when run under valgrind by using the wait_until_rows_count macro that loops until the number of rows becomes 14 instead of sleep 0.1, which is obviously very fragile. ------------------------------------------------------------------------ r6096 \| vasil \| 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) \| 4 lines branches/zip: Add ChangeLog entry for r6095. ------------------------------------------------------------------------ r6099 \| jyang \| 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) \| 7 lines branches/zip: Port bug #46000 related changes from 5.1 to zip branch. Due to different code path for creating index in zip branch comparing to 5.1), the index reserved name check function is extended to be used in ha_innobase::add_index(). rb://190 Approved by: Marko ------------------------------------------------------------------------ r6100 \| jyang \| 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) \| 6 lines branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot be used for push_warning_* call any more. Switch to WARN_LEVEL_WARN. Bug #47233. rb://172 approved by Sunny Bains and Marko. ------------------------------------------------------------------------ r6101 \| jyang \| 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) \| 7 lines branches/zip: Update test result with the WARN_LEVEL_ERROR to WARN_LEVEL_WARN change. This is the same result as submitted in rb://172 review, which approved by Sunny Bains and Marko. ------------------------------------------------------------------------ r6102 \| marko \| 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) \| 1 line branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove. ------------------------------------------------------------------------ r6103 \| marko \| 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) \| 4 lines branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless Valgrind warnings about uninitialized data. (The warnings were harmless, because the fields would be initialized at a later stage.) ------------------------------------------------------------------------ r6105 \| calvin \| 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) \| 6 lines branches/zip: backport r3848 from 6.0 branch ---- branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490) ------------------------------------------------------------------------ r6107 \| marko \| 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) \| 5 lines branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics in order to catch the buf_pool->LRU_old corruption reported in Issue #381. buf_LRU_old_init(): Set the property from the tail towards the front of the buf_pool->LRU list, in order not to trip the debug check. ------------------------------------------------------------------------ r6108 \| calvin \| 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) \| 5 lines branches/zip: close file handle when building with UNIV_HOTBACKUP The change does not affect regular InnoDB engine. Confirmed by Marko. ------------------------------------------------------------------------ r6109 \| jyang \| 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) \| 7 lines branches/zip: 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. Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect rb://198 Approved by: Marko ------------------------------------------------------------------------ r6110 \| marko \| 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) \| 2 lines branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL: Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include. ------------------------------------------------------------------------ r6111 \| marko \| 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) \| 33 lines branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions. This was reported as Issue #381. buf_page_set_old(): Assert that blocks may only be set old if buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero. Assert that buf_pool->LRU_old points to the block at the old/new boundary. buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate the added assertions. buf_LRU_old_init(): Replace buf_page_set_old() with a direct assignment to bpage->old, because these loops that initialize all the blocks would temporarily violate the assertions about buf_pool->LRU_old. buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also clear all bpage->old flags and set buf_pool->LRU_old_len = 0. buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the buf_page_set_old() call later in order not to violate the debug assertions. If buf_pool->LRU_old is NULL, set old=FALSE. buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a dummy buf_page_set_old() call that performs more thorough checks. buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic. buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter. buf0buf.h: Revise the documentation of buf_page_t::old and buf_pool_t::LRU_old_len. ------------------------------------------------------------------------ r6112 \| calvin \| 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) \| 4 lines branches/zip: consideration for icc compilers Proposed by MySQL, and approved by Marko. ------------------------------------------------------------------------ r6113 \| vasil \| 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) \| 93 lines branches/zip: Merge r5912:6112 from branches/5.1: (after this merge the innodb-autoinc test starts to fail, but I commit anyway because it would be easier to investigate the failure this way) ------------------------------------------------------------------------ r5952 \| calvin \| 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) \| 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: fix bug#42383: Can't create table 'test.bug39438' For embedded server, MySQL may pass in full path, which is currently disallowed. It is needed to relax the condition by accepting full paths in the embedded case. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r6032 \| vasil \| 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) \| 8 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Fix Bug#38996 Race condition in ANALYZE TABLE by serializing ANALYZE TABLE inside InnoDB. Approved by: Heikki (rb://175) ------------------------------------------------------------------------ r6045 \| jyang \| 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) \| 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug47777.result A /branches/5.1/mysql-test/innodb_bug47777.test branches/5.1: Fix bug #47777. Treat the Geometry data same as Binary BLOB in ha_innobase::store_key_val_for_row(), since the Geometry data is stored as Binary BLOB in Innodb. Review: rb://180 approved by Marko Makela. ------------------------------------------------------------------------ r6051 \| sunny \| 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) \| 6 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Ignore negative values supplied by the user when calculating the next value to store in dict_table_t. Setting autoincrement columns top negative values is undefined behavior and this change should bring the behavior of InnoDB closer to what users expect. Added several tests to check. rb://162 ------------------------------------------------------------------------ r6052 \| sunny \| 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) \| 4 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix the test results too. rb://164 ------------------------------------------------------------------------ r6053 \| sunny \| 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) \| 6 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Copy the maximum AUTOINC value from the old table to the new table when MySQL does a CREATE INDEX ON T. This is required because MySQL does a table copy, rename and drops the old table. Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb rb://168 ------------------------------------------------------------------------ r6076 \| vasil \| 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) \| 4 lines Changed paths: M /branches/5.1/row/row0mysql.c branches/5.1: Fix typo. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6114 \| vasil \| 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) \| 6 lines branches/zip: * Add ChangeLog entries for latest changes * Obey alphabetical order in the list of the files * White-space fixup ------------------------------------------------------------------------ r6121 \| sunny \| 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) \| 7 lines branches/zip: This test has been problematic for sometime now. The underlying bug is that the data dictionaries get out of sync. In the AUTOINC code we try and apply salve to the symptoms. In the past MySQL made some unrelated change and the dictionaries stopped getting out of sync and this test started to fail. Now, it seems they have reverted that changed and the test is passing again. I suspect this is not he last time that this test will change. ------------------------------------------------------------------------ r6124 \| jyang \| 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) \| 5 lines branches/zip: Correct the bug number for -r6109 change from # 48273 to #48237 ------------------------------------------------------------------------ r6126 \| vasil \| 2009-10-30 19:36:07 +1100 (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. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6130 \| marko \| 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) \| 9 lines branches/zip: Free all resources at shutdown. Set pointers to NULL, so that Valgrind will not complain about freed data structures that are reachable via pointers. This addresses Bug #45992 and Bug #46656. This patch is mostly based on changes copied from branches/embedded-1.0, mainly c5432, c3439, c3134, c2994, c2978, but also some other code was copied. Some added cleanup code is specific to MySQL/InnoDB. rb://199 approved by Sunny Bains ------------------------------------------------------------------------	16 years ago
sunny	00c16e8a30	branches/innodb+: Merge revisions r5971:6130 from branches/zip. ------------------------------------------------------------------------ r5971 \| marko \| 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) \| 2 lines branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup when the pwrite system call is not available. ------------------------------------------------------------------------ r5972 \| marko \| 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) \| 5 lines branches/zip: fil_node_open_file(): In InnoDB Hot Backup, determine the page size of single-file tablespaces before computing the file node size. Otherwise, the space->size of compressed tablespaces would be computed with UNIV_PAGE_SIZE instead of key_block_size. This should fix Issue #313. ------------------------------------------------------------------------ r5973 \| marko \| 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) \| 2 lines branches/zip: recv_add_to_hash_table(): Simplify obfuscated pointer arithmetics. ------------------------------------------------------------------------ r5978 \| marko \| 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) \| 1 line branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined. ------------------------------------------------------------------------ r5979 \| marko \| 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) \| 4 lines branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary. This preprocessor symbol has been recently introduced in MySQL 5.1. The InnoDB Plugin should remain source compatible with MySQL 5.1.24 and later. ------------------------------------------------------------------------ r5988 \| calvin \| 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) \| 8 lines branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA 1453 (0x5AD) for InnoDB backend When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES occurs, yields for 100ms and retries the operation. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r5992 \| vasil \| 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) \| 4 lines branches/zip: Add ChangeLog entry for c5988. ------------------------------------------------------------------------ r5994 \| marko \| 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) \| 17 lines branches/zip: Try to prevent the reuse of tablespace identifiers after InnoDB has crashed during table creation. Also, refuse to start if files with duplicate tablespace identifiers are encountered. fil_node_create(): Update fil_system->max_assigned_id. This should prevent the reuse of a space->id when InnoDB does a full crash recovery and invokes fil_load_single_table_tablespaces(). Normally, fil_system->max_assigned_id is initialized from SELECT MAX(ID) FROM SYS_TABLES. fil_open_single_table_tablespace(): Return FALSE when fil_space_create() fails. fil_load_single_table_tablespace(): Exit if fil_space_create() fails and innodb_force_recovery=0. rb://173 approved by Heikki Tuuri. This addresses Issue #335. ------------------------------------------------------------------------ r5995 \| marko \| 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) \| 17 lines branches/zip: Do not write to PAGE_INDEX_ID after page creation, not even when restoring an uncompressed page after a compression failure. btr_page_reorganize_low(): On compression failure, do not restore those page header fields that should not be affected by the reorganization. Instead, compare the fields. page_zip_decompress(): Add the parameter ibool all, for copying all page header fields. Pass the parameter all=TRUE on block read completion, redo log application, and page_zip_validate(); pass all=FALSE in all other cases. page_zip_reorganize(): Do not restore the uncompressed page on failure. It will be restored (to pre-modification state) by the caller anyway. rb://167, Issue #346 ------------------------------------------------------------------------ r5996 \| marko \| 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) \| 4 lines branches/zip: Address Issue #350 in comments. lock_rec_queue_validate(), lock_rec_queue_validate(): Note that this debug code may violate the latching order and cause deadlocks. ------------------------------------------------------------------------ r5997 \| marko \| 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) \| 12 lines branches/zip: Remove an assertion failure when the InnoDB data dictionary is inconsistent with the MySQL .frm file. ha_innobase::index_read(): When the index cannot be found, return an error. ha_innobase::change_active_index(): When prebuilt->index == NULL, set also prebuilt->index_usable = FALSE. This is not needed for correctness, because prebuilt->index_usable is only checked by row_search_for_mysql(), which requires prebuilt->index != NULL. This addresses Issue #349. Approved by Heikki Tuuri over IM. ------------------------------------------------------------------------ r6005 \| vasil \| 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) \| 4 lines branches/zip: ChangeLog: wrap around 78th column, not earlier. ------------------------------------------------------------------------ r6006 \| vasil \| 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) \| 4 lines branches/zip: Add ChangeLog entry for the release of 1.0.4. ------------------------------------------------------------------------ r6007 \| vasil \| 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) \| 6 lines branches/zip: Fix the year, should be 2009. Pointed by: Calvin ------------------------------------------------------------------------ r6026 \| marko \| 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) \| 1 line branches/zip: Add some debug assertions for checking FSEG_MAGIC_N. ------------------------------------------------------------------------ r6028 \| marko \| 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) \| 3 lines branches/zip: recv_no_log_write: New debug flag for tracking down Mantis Issue #347. No modifications should be made to the database while recv_apply_hashed_log_recs() is about to complete. ------------------------------------------------------------------------ r6029 \| calvin \| 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) \| 4 lines branches/zip: non-functional changes Fix typo. ------------------------------------------------------------------------ r6031 \| marko \| 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) \| 49 lines branches/zip: Clean up after a crash during DROP INDEX. When InnoDB crashes while dropping an index, ensure that the index will be completely dropped during crash recovery. row_merge_drop_index(): Before dropping an index, rename the index to start with TEMP_INDEX_PREFIX_STR and commit the change, so that row_merge_drop_temp_indexes() will drop the index after crash recovery if the server crashes while dropping the index. fseg_inode_try_get(): New function, forked from fseg_inode_get(). Return NULL if the file segment index node is free. fseg_inode_get(): Assert that the file segment index node is not free. fseg_free_step(): If the file segment index node is already free, print a diagnostic message and return TRUE. fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that allocated-and-freed file segment index nodes can be better distinguished from uninitialized ones. This is rb://174, addressing Issue #348. Tested by restarting mysqld upon the completion of the added log_write_up_to() invocation below, during DROP INDEX. The index was dropped after crash recovery, and re-issuing the DROP INDEX did not crash the server. Index: btr/btr0btr.c =================================================================== --- btr/btr0btr.c (revision 6026) +++ btr/btr0btr.c (working copy) @@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri #include "ibuf0ibuf.h" #include "trx0trx.h" +#include "log0log.h" /* Latching strategy of the InnoDB B-tree -------------------------------------- @@ -873,6 +874,8 @@ leaf_loop: goto leaf_loop; } + + log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE); top_loop: mtr_start(&mtr); ------------------------------------------------------------------------ r6033 \| calvin \| 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) \| 4 lines branches/zip: fix a typo in error message Reported as bug#47763. ------------------------------------------------------------------------ r6043 \| inaam \| 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) \| 12 lines branches/zip rb://176 Do not invalidate buffer pool while an LRU batch is active. Added code to buf_pool_invalidate() to wait for the running batches to finish. This patch also resets the state of buf_pool struct at invalidation. This addresses the concern where buf_pool->freed_page_clock becomes non-zero because we read in a system tablespace page for file format info at startup. Approved by: Marko ------------------------------------------------------------------------ r6044 \| pekka \| 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) \| 5 lines branches/zip: Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP). This is part of the fix for Issue #186. Note! The Windows implementation is incomplete. ------------------------------------------------------------------------ r6046 \| pekka \| 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) \| 3 lines branches/zip: Revert r6044 which added os_file_is_same() function (issue#186). This functionality is moved to Hot Backup source tree. ------------------------------------------------------------------------ r6048 \| vasil \| 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) \| 16 lines branches/zip: When scanning a directory readdir() is called and stat() after it, if a file is deleted between the two calls stat will fail and the whole precedure will fail. Change this behavior to continue with the next entry if stat() fails because of nonexistent file. This is transparent change as it will make it look as if the file was deleted before the readdir() call. This change is needed in order to fix https://svn.innodb.com/mantis/view.php?id=174 in which we need to abort if os_file_readdir_next_file() encounters "real" errors. Approved by: Marko, Pekka (rb://177) ------------------------------------------------------------------------ r6049 \| vasil \| 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) \| 7 lines branches/zip: Fix compilation warning in Hot Backup: innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace': innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t' ------------------------------------------------------------------------ r6064 \| calvin \| 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) \| 4 lines branches/zip: non-functional changes Changes from MySQL to fix build issue. ------------------------------------------------------------------------ r6065 \| inaam \| 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) \| 7 lines branches/zip rb://182 Call fsync() on datafiles after a batch of pages is written to disk even when skip_innodb_doublewrite is set. Approved by: Heikki ------------------------------------------------------------------------ r6080 \| sunny \| 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) \| 3 lines branches/zip: Change page_mem_alloc_free() to inline. Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10 ------------------------------------------------------------------------ r6084 \| vasil \| 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) \| 4 lines branches/zip: Add ChangeLog entry for r6080. ------------------------------------------------------------------------ r6095 \| vasil \| 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) \| 7 lines branches/zip: Fix Bug#47808 innodb_information_schema.test fails when run under valgrind by using the wait_until_rows_count macro that loops until the number of rows becomes 14 instead of sleep 0.1, which is obviously very fragile. ------------------------------------------------------------------------ r6096 \| vasil \| 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) \| 4 lines branches/zip: Add ChangeLog entry for r6095. ------------------------------------------------------------------------ r6099 \| jyang \| 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) \| 7 lines branches/zip: Port bug #46000 related changes from 5.1 to zip branch. Due to different code path for creating index in zip branch comparing to 5.1), the index reserved name check function is extended to be used in ha_innobase::add_index(). rb://190 Approved by: Marko ------------------------------------------------------------------------ r6100 \| jyang \| 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) \| 6 lines branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot be used for push_warning_* call any more. Switch to WARN_LEVEL_WARN. Bug #47233. rb://172 approved by Sunny Bains and Marko. ------------------------------------------------------------------------ r6101 \| jyang \| 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) \| 7 lines branches/zip: Update test result with the WARN_LEVEL_ERROR to WARN_LEVEL_WARN change. This is the same result as submitted in rb://172 review, which approved by Sunny Bains and Marko. ------------------------------------------------------------------------ r6102 \| marko \| 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) \| 1 line branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove. ------------------------------------------------------------------------ r6103 \| marko \| 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) \| 4 lines branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless Valgrind warnings about uninitialized data. (The warnings were harmless, because the fields would be initialized at a later stage.) ------------------------------------------------------------------------ r6105 \| calvin \| 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) \| 6 lines branches/zip: backport r3848 from 6.0 branch ---- branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490) ------------------------------------------------------------------------ r6107 \| marko \| 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) \| 5 lines branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics in order to catch the buf_pool->LRU_old corruption reported in Issue #381. buf_LRU_old_init(): Set the property from the tail towards the front of the buf_pool->LRU list, in order not to trip the debug check. ------------------------------------------------------------------------ r6108 \| calvin \| 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) \| 5 lines branches/zip: close file handle when building with UNIV_HOTBACKUP The change does not affect regular InnoDB engine. Confirmed by Marko. ------------------------------------------------------------------------ r6109 \| jyang \| 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) \| 7 lines branches/zip: 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. Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect rb://198 Approved by: Marko ------------------------------------------------------------------------ r6110 \| marko \| 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) \| 2 lines branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL: Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include. ------------------------------------------------------------------------ r6111 \| marko \| 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) \| 33 lines branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions. This was reported as Issue #381. buf_page_set_old(): Assert that blocks may only be set old if buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero. Assert that buf_pool->LRU_old points to the block at the old/new boundary. buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate the added assertions. buf_LRU_old_init(): Replace buf_page_set_old() with a direct assignment to bpage->old, because these loops that initialize all the blocks would temporarily violate the assertions about buf_pool->LRU_old. buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also clear all bpage->old flags and set buf_pool->LRU_old_len = 0. buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the buf_page_set_old() call later in order not to violate the debug assertions. If buf_pool->LRU_old is NULL, set old=FALSE. buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a dummy buf_page_set_old() call that performs more thorough checks. buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic. buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter. buf0buf.h: Revise the documentation of buf_page_t::old and buf_pool_t::LRU_old_len. ------------------------------------------------------------------------ r6112 \| calvin \| 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) \| 4 lines branches/zip: consideration for icc compilers Proposed by MySQL, and approved by Marko. ------------------------------------------------------------------------ r6113 \| vasil \| 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) \| 93 lines branches/zip: Merge r5912:6112 from branches/5.1: (after this merge the innodb-autoinc test starts to fail, but I commit anyway because it would be easier to investigate the failure this way) ------------------------------------------------------------------------ r5952 \| calvin \| 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) \| 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: fix bug#42383: Can't create table 'test.bug39438' For embedded server, MySQL may pass in full path, which is currently disallowed. It is needed to relax the condition by accepting full paths in the embedded case. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r6032 \| vasil \| 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) \| 8 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Fix Bug#38996 Race condition in ANALYZE TABLE by serializing ANALYZE TABLE inside InnoDB. Approved by: Heikki (rb://175) ------------------------------------------------------------------------ r6045 \| jyang \| 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) \| 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug47777.result A /branches/5.1/mysql-test/innodb_bug47777.test branches/5.1: Fix bug #47777. Treat the Geometry data same as Binary BLOB in ha_innobase::store_key_val_for_row(), since the Geometry data is stored as Binary BLOB in Innodb. Review: rb://180 approved by Marko Makela. ------------------------------------------------------------------------ r6051 \| sunny \| 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) \| 6 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Ignore negative values supplied by the user when calculating the next value to store in dict_table_t. Setting autoincrement columns top negative values is undefined behavior and this change should bring the behavior of InnoDB closer to what users expect. Added several tests to check. rb://162 ------------------------------------------------------------------------ r6052 \| sunny \| 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) \| 4 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix the test results too. rb://164 ------------------------------------------------------------------------ r6053 \| sunny \| 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) \| 6 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Copy the maximum AUTOINC value from the old table to the new table when MySQL does a CREATE INDEX ON T. This is required because MySQL does a table copy, rename and drops the old table. Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb rb://168 ------------------------------------------------------------------------ r6076 \| vasil \| 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) \| 4 lines Changed paths: M /branches/5.1/row/row0mysql.c branches/5.1: Fix typo. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6114 \| vasil \| 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) \| 6 lines branches/zip: * Add ChangeLog entries for latest changes * Obey alphabetical order in the list of the files * White-space fixup ------------------------------------------------------------------------ r6121 \| sunny \| 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) \| 7 lines branches/zip: This test has been problematic for sometime now. The underlying bug is that the data dictionaries get out of sync. In the AUTOINC code we try and apply salve to the symptoms. In the past MySQL made some unrelated change and the dictionaries stopped getting out of sync and this test started to fail. Now, it seems they have reverted that changed and the test is passing again. I suspect this is not he last time that this test will change. ------------------------------------------------------------------------ r6124 \| jyang \| 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) \| 5 lines branches/zip: Correct the bug number for -r6109 change from # 48273 to #48237 ------------------------------------------------------------------------ r6126 \| vasil \| 2009-10-30 19:36:07 +1100 (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. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6130 \| marko \| 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) \| 9 lines branches/zip: Free all resources at shutdown. Set pointers to NULL, so that Valgrind will not complain about freed data structures that are reachable via pointers. This addresses Bug #45992 and Bug #46656. This patch is mostly based on changes copied from branches/embedded-1.0, mainly c5432, c3439, c3134, c2994, c2978, but also some other code was copied. Some added cleanup code is specific to MySQL/InnoDB. rb://199 approved by Sunny Bains ------------------------------------------------------------------------	16 years ago
calvin	2d831d7184	branches/innodb+: remove two assertions Suggested by Marko.	16 years ago
calvin	1dd1d1fe53	branches/innodb+: remove two assertions Suggested by Marko.	16 years ago
calvin	30b23be8e3	branches/innodb+: fix build errors on Windows - Change os_aio_use_native_aio to srv_use_native_aio - Change several C++ style variable declarations to C style in .C files Approved by: Inaam rb://189, mantis issue #362	16 years ago
calvin	b512b9de6b	branches/innodb+: fix build errors on Windows - Change os_aio_use_native_aio to srv_use_native_aio - Change several C++ style variable declarations to C style in .C files Approved by: Inaam rb://189, mantis issue #362	16 years ago
inaam	17eed9d880	branches/zip rb://182 Call fsync() on datafiles after a batch of pages is written to disk even when skip_innodb_doublewrite is set. Approved by: Heikki	16 years ago
inaam	51c89873d1	branches/zip rb://182 Call fsync() on datafiles after a batch of pages is written to disk even when skip_innodb_doublewrite is set. Approved by: Heikki	16 years ago
Aleksandr Kuzminsky	9a591471e0	Sync with rev.105	16 years ago
Aleksandr Kuzminsky	222507900c	sync with rev.96	16 years ago
Aleksandr Kuzminsky	cbda445b47	sync with rev.93	16 years ago
inaam	8a3ea85c92	branches/innodb+: Merge revisions 5144:5524 from branches/zip ------------------------------------------------------------------------ r5147 \| marko \| 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) \| 1 line branches/zip: ibuf0ibuf.c: Improve a comment. ------------------------------------------------------------------------ r5149 \| marko \| 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) \| 34 lines branches/zip: Merge revisions 4994:5148 from branches/5.1: ------------------------------------------------------------------------ r5126 \| vasil \| 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) \| 9 lines branches/5.1: Preparation for the fix of Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Non-functional change: move FSP_* macros from fsp0fsp.h to a new file fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE in mtr0log.ic. ------------------------------------------------------------------------ r5127 \| vasil \| 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) \| 9 lines branches/5.1: Preparation for the fix of Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h and include fsp0fsp.h just before it is needed. This is needed in order to be able to use TRX_SYS_SPACE in mtr0log.ic. ------------------------------------------------------------------------ r5128 \| vasil \| 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) \| 7 lines branches/5.1: Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Do not write redo log for the pages in the doublewrite buffer. Also, do not make a dummy change to the page because this is not needed. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5169 \| marko \| 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) \| 1 line branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types. ------------------------------------------------------------------------ r5176 \| marko \| 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) \| 1 line branches/zip: Correct a debug assertion that was added in r5125. ------------------------------------------------------------------------ r5201 \| marko \| 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) \| 2 lines branches/zip: Clean up some comments. Make the rec parameter of mlog_open_and_write_index() const. ------------------------------------------------------------------------ r5234 \| marko \| 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) \| 44 lines branches/zip: Merge revisions 5148:5233 from branches/5.1: ------------------------------------------------------------------------ r5150 \| vasil \| 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) \| 4 lines branches/5.1: Whitespace fixup. ------------------------------------------------------------------------ r5191 \| vasil \| 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) \| 19 lines branches/5.1: Merge a change from MySQL (this fixes the failing innodb_mysql test): ------------------------------------------------------------ revno: 1810.3894.10 committer: Sergey Glukhov <Sergey.Glukhov@sun.com> branch nick: mysql-5.0-bugteam timestamp: Tue 2009-05-19 11:32:21 +0500 message: Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value Internal InnoDN FK parser does not recognize '\'' as quotation symbol. Suggested fix is to add '\'' symbol check for quotation condition (dict_strip_comments() function). modified: innobase/dict/dict0dict.c mysql-test/r/innodb_mysql.result mysql-test/t/innodb_mysql.test ------------------------------------------------------------------------ r5233 \| marko \| 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) \| 11 lines branches/5.1: Merge the test case from r5232 from branches/5.0: ------------------------------------------------------------------------ r5232 \| marko \| 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) \| 21 lines branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565 (Update Query Results in "1 Row Affected" But Should Be "Zero Rows"). Also, add a test case for Bug #40565. rb://128 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5250 \| marko \| 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) \| 1 line branches/zip: Add Doxygen comments to the rest of buf0. ------------------------------------------------------------------------ r5251 \| marko \| 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) \| 1 line branches/zip: Replace <= in a function comment. ------------------------------------------------------------------------ r5253 \| marko \| 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) \| 1 line branches/zip: Add missing Doxygen comments for page0zip. ------------------------------------------------------------------------ r5261 \| vasil \| 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) \| 15 lines branches/zip: Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern) The changes are: 1) Take into account access pattern when deciding whether or not to do linear read ahead. 2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic, global to control linear read ahead behvior 3) Disable random read ahead. Keep the code for now. Submitted by: Inaam (rb://122) Approved by: Heikki (rb://122) ------------------------------------------------------------------------ r5262 \| vasil \| 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) \| 22 lines branches/zip: Enable functionality to have multiple background io helper threads. This patch is based on percona contributions. More details about this patch will be written at: https://svn.innodb.com/innobase/MultipleBackgroundThreads The patch essentially does the following: expose following knobs: innodb_read_io_threads = [1 - 64] default 1 innodb_write_io_threads = [1 - 64] default 1 deprecate innodb_file_io_threads (this parameter was relevant only on windows) Internally it allows multiple segments for read and write IO request arrays where one thread works on one segement. Submitted by: Inaam (rb://124) Approved by: Heikki (rb://124) ------------------------------------------------------------------------ r5263 \| vasil \| 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) \| 4 lines branches/zip: Whitespace cleanup. ------------------------------------------------------------------------ r5264 \| vasil \| 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) \| 4 lines branches/zip: Add ChangeLog entry for r5261. ------------------------------------------------------------------------ r5265 \| vasil \| 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) \| 4 lines branches/zip: Add ChangeLog entry for r5262. ------------------------------------------------------------------------ r5268 \| inaam \| 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) \| 7 lines branches/zip Non functional change: Added legal notices acknowledging percona contribution to the multiple IO helper threads patch i.e.: r5262 ------------------------------------------------------------------------ r5283 \| inaam \| 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) \| 9 lines branches/zip rb://130 Enable Group Commit functionality that was broken in 5.0 when distributed transactions were introduced. Reviewed by: Heikki ------------------------------------------------------------------------ r5319 \| marko \| 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) \| 3 lines branches/zip: Declare os_thread_id_t as unsigned long, because ulint is wrong on Win64. Pointed out by Vladislav Vaintroub <wlad@sun.com>. ------------------------------------------------------------------------ r5320 \| inaam \| 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) \| 14 lines branches/zip rb://131 This patch changes the following defaults: max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99 additional_mem_pool_size: default from 1 to 8 MB buffer_pool_size: default from 8 to 128 MB log_buffer_size: default from 1 to 8 MB read_io_threads/write_io_threads: default from 1 to 4 The log file sizes are untouched because of upgrade issues Reviewed by: Heikki ------------------------------------------------------------------------ r5330 \| marko \| 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) \| 2 lines branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting buf_pool->n_pend_unzip while only holding buf_pool_mutex. ------------------------------------------------------------------------ r5331 \| marko \| 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) \| 2 lines branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call. The function must switch on the block state anyway. ------------------------------------------------------------------------ r5332 \| vasil \| 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) \| 4 lines branches/zip: Add ChangeLog entries for r5283 and r5320. ------------------------------------------------------------------------ r5333 \| marko \| 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) \| 1 line branches/zip: buf_page_io_query(): Remove unused function. ------------------------------------------------------------------------ r5335 \| marko \| 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) \| 2 lines branches/zip: innodb.test: Adjust the tolerance of innodb_buffer_pool_pages_total for r5320. ------------------------------------------------------------------------ r5342 \| marko \| 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) \| 60 lines branches/zip: Merge revisions 5233:5341 from branches/5.1: ------------------------------------------------------------------------ r5233 \| marko \| 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) \| 11 lines branches/5.1: Merge the test case from r5232 from branches/5.0: ------------------------------------------------------------------------ r5232 \| marko \| 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) \| 21 lines branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565 (Update Query Results in "1 Row Affected" But Should Be "Zero Rows"). Also, add a test case for Bug #40565. rb://128 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5243 \| sunny \| 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) \| 14 lines branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before the bug fix we would assert on missing autoinc columns. With this fix we allow MySQL to open the table but set the next autoinc value for the column to the MAX value. This effectively disables the next value generation. INSERTs will fail with a generic AUTOINC failure. However, the user should be able to read/dump the table, set the column values explicitly, use ALTER TABLE to set the next autoinc value and/or sync the two data dictionaries to resume normal operations. Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the index (PRIMARY) rb://118 ------------------------------------------------------------------------ r5252 \| sunny \| 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) \| 2 lines branches/5.1: The version of the result file checked in was broken in r5243. ------------------------------------------------------------------------ r5259 \| vasil \| 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) \| 7 lines branches/5.1: Remove the word "Error" from the printout because the mysqltest suite interprets it as an error and thus the innodb-autoinc test fails. Approved by: Sunny (via IM) ------------------------------------------------------------------------ r5339 \| marko \| 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) \| 2 lines branches/5.1: Add missing #include "mtr0log.h" so that the code compiles with -DUNIV_MUST_NOT_INLINE. (null merge; this had already been committed in branches/zip) ------------------------------------------------------------------------ r5340 \| marko \| 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) \| 4 lines branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown, refuse to unlock the record. (Bug #45357, caused by the fix of Bug #39320). rb://132 approved by Sunny Bains. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5343 \| vasil \| 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) \| 4 lines branches/zip: Add ChangeLog entry for r5342. ------------------------------------------------------------------------ r5344 \| marko \| 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) \| 1 line branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426) ------------------------------------------------------------------------ r5391 \| marko \| 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) \| 2 lines branches/zip: buf_page_get_zip(): Fix a bogus warning about block_mutex being possibly uninitialized. ------------------------------------------------------------------------ r5392 \| marko \| 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) \| 4 lines branches/zip: ha_innobase::check_if_incompatible_data(): When ROW_FORMAT=DEFAULT, do not compare to get_row_type(). Without this change, fast index creation will be disabled in recent versions of MySQL 5.1. ------------------------------------------------------------------------ r5393 \| pekka \| 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) \| 4 lines branches/zip: Minor changes for Hot Backup to build correctly. (The code bracketed between #ifdef UNIV_HOTBACKUP and #endif / UNIV_HOTBACKUP /). This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------------------ r5394 \| pekka \| 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) \| 4 lines branches/zip: Add functions for checking the format of tablespaces for Hot Backup build (UNIV_HOTBACKUP defined). This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------------------ r5397 \| calvin \| 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) \| 7 lines branches/zip: change the header file path. Change the header file path from ../storage/innobase/include/ to ../include/. In the planned 5.1 + plugin release, the source directory of the plugin will not be in storage/innobase. Approved by: Heikki (IM) ------------------------------------------------------------------------ r5407 \| calvin \| 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) \| 4 lines branches/zip: remove relative path of header files. Suggested by Marko. ------------------------------------------------------------------------ r5412 \| marko \| 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) \| 1 line branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290. ------------------------------------------------------------------------ r5415 \| marko \| 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) \| 3 lines branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch. This addresses Bug #44571 but does not fix it. rb://135 approved by Sunny Bains. ------------------------------------------------------------------------ r5417 \| marko \| 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) \| 1 line branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment. ------------------------------------------------------------------------ r5418 \| marko \| 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) \| 5 lines branches/zip: Fix a race condition caused by SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749) When innodb_commit_concurrency is initially set nonzero, DEFAULT would change it back to 0, triggering Bug #42101. rb://139 approved by Heikki Tuuri. ------------------------------------------------------------------------ r5423 \| calvin \| 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) \| 2 lines branches/zip: Fix typos. ------------------------------------------------------------------------ r5425 \| marko \| 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) \| 4 lines branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index(): Start prebuilt->trx before locking the table. This should fix Issue #293 and could fix Issue #229. Approved by Sunny (over IM). ------------------------------------------------------------------------ r5426 \| marko \| 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) \| 3 lines branches/zip: buf_page_get_gen(): Fix a race condition when reading buf_fix_count. This could explain Issue #156. Tested by Michael. ------------------------------------------------------------------------ r5427 \| marko \| 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) \| 5 lines branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages(): Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED). buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)). Issue #289, rb://136 approved by Sunny Bains ------------------------------------------------------------------------ r5428 \| marko \| 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) \| 2 lines branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast. Do not do arithmetics on void pointers. ------------------------------------------------------------------------ r5429 \| marko \| 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) \| 13 lines branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT or SET GLOBAL innodb_file_format_check=DEFAULT. innodb_file_format.test: New test for innodb_file_format and innodb_file_format_check. innodb_file_format_name_validate(): Store the string in save. innodb_file_format_name_update(): Check the string again. innodb_file_format_check_validate(): Store the string in save. innodb_file_format_check_update(): Check the string again. Issue #282, rb://140 approved by Heikki Tuuri ------------------------------------------------------------------------ r5430 \| marko \| 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) \| 2 lines branches/zip: lock_rec_validate_page(): Add another assertion to track down Issue #289. ------------------------------------------------------------------------ r5431 \| marko \| 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) \| 1 line branches/zip: Revert an accidentally made change in r5430 to univ.i. ------------------------------------------------------------------------ r5437 \| marko \| 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: ibuf_dummy_index_free(): Beautify the comment. ------------------------------------------------------------------------ r5438 \| marko \| 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: fseg_free(): Remove this unused function. ------------------------------------------------------------------------ r5439 \| marko \| 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG. This function is unused, but it could turn out to be a useful debugging aid. ------------------------------------------------------------------------ r5441 \| marko \| 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: ha_delete(): Remove this unused function that was very similar to ha_search_and_delete_if_found(). ------------------------------------------------------------------------ r5442 \| marko \| 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove. ------------------------------------------------------------------------ r5443 \| marko \| 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: os_event_create_auto(): Unused, remove. ------------------------------------------------------------------------ r5444 \| marko \| 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: que_graph_try_free(): Unused, remove. ------------------------------------------------------------------------ r5445 \| marko \| 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: row_build_row_ref_from_row(): Unused, remove. ------------------------------------------------------------------------ r5446 \| marko \| 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove. ------------------------------------------------------------------------ r5447 \| marko \| 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: srv_que_task_queue_check(): Unused, remove. ------------------------------------------------------------------------ r5448 \| marko \| 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: mem_heap_cat(): Unused, remove. ------------------------------------------------------------------------ r5449 \| marko \| 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: innobase_start_or_create_for_mysql(): Invoke os_get_os_version() at most once. ------------------------------------------------------------------------ r5450 \| marko \| 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: os_file_close_no_error_handling(): Unused, remove. ------------------------------------------------------------------------ r5451 \| marko \| 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: page_set_max_trx_id(): Make the code compile with UNIV_HOTBACKUP. ------------------------------------------------------------------------ r5452 \| marko \| 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: os_file_close_no_error_handling(): Restore, as this function is used within InnoDB Hot Backup. ------------------------------------------------------------------------ r5453 \| marko \| 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: os_process_set_priority_boost(): Unused, remove. ------------------------------------------------------------------------ r5454 \| marko \| 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: Replace a non-ASCII character (ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute. ------------------------------------------------------------------------ r5456 \| inaam \| 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) \| 4 lines branches/zip Non functional change. s/Percona/Percona Inc./ ------------------------------------------------------------------------ r5470 \| vasil \| 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) \| 16 lines branches/zip: Use PAUSE instruction inside spinloop if it is available. The patch was originally developed by Mikael Ronstrom <mikael@mysql.com> and can be found here: http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800 Approved by: Heikki (rb://137) ------------------------------------------------------------------------ r5481 \| vasil \| 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) \| 4 lines branches/zip: Remove unnecessary quotes and simplify plug.in. ------------------------------------------------------------------------ r5482 \| calvin \| 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) \| 5 lines branches/zip: add COPYING files for Percona and Sun Micro. 1.0.4 contains patches based on contributions from Percona and Sun Microsystems. ------------------------------------------------------------------------ r5483 \| calvin \| 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) \| 3 lines branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake. Windows will support PAUSE instruction by default. ------------------------------------------------------------------------ r5484 \| inaam \| 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) \| 13 lines branches/zip rb://126 Based on contribution from Google Inc. This patch introduces a new parameter innodb_io_capacity to control the rate at which master threads performs various tasks. The default value is 200 and higher values imply more aggressive flushing and ibuf merges from within the master thread. This patch also changes the ibuf merge from synchronous to asynchronous. Another minor change is not to force the master thread to wait for a log flush to complete every second. Approved by: Heikki ------------------------------------------------------------------------ r5485 \| inaam \| 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) \| 18 lines branches/zip rb://138 The current implementation is to try to flush the neighbors of every page that we flush. This patch makes the following distinction: 1) If the flush is from flush_list AND 2) If the flush is intended to move the oldest_modification LSN ahead (this happens when a user thread sees little space in the log file and attempts to flush pages from the buffer pool so that a checkpoint can be made) THEN Do not try to flush the neighbors. Just focus on flushing dirty pages at the end of flush_list Approved by: Heikki ------------------------------------------------------------------------ r5486 \| inaam \| 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) \| 29 lines branches/zip rb://133 This patch introduces heuristics based flushing rate of dirty pages to avoid IO bursts at checkpoint. 1) log_capacity / log_generated per second gives us number of seconds in which ALL dirty pages need to be flushed. Based on this rough assumption we can say that n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate 2) We use weighted averages (hard coded to 20 seconds) of log_generation_rate to avoid resonance. 3) From the desired_flush_rate we subtract the number of pages that have been flushed due to LRU flushing. That gives us pages that we should flush as part of flush_list cleanup. And that is the number (capped by maximum io_capacity) that we try to flush from the master thread. Knobs: ====== innodb_adaptive_flushing: boolean, global, dynamic, default TRUE. Since this heuristic is very experimental and has the potential to dramatically change the IO pattern I think it is a good idea to leave a knob to turn it off. Approved by: Heikki ------------------------------------------------------------------------ r5487 \| calvin \| 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) \| 7 lines branches/zip: fix PAUSE instruction patch on Windows The original PAUSE instruction patch (r5470) does not compile on Windows. Also, there is an elegant way of doing it on Windows - YieldProcessor(). Approved by: Heikki (on IM) ------------------------------------------------------------------------ r5489 \| vasil \| 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) \| 9 lines branches/zip: Change the defaults for innodb_sync_spin_loops: 20 -> 30 innodb_spin_wait_delay: 5 -> 6 This change was proposed by Sun/MySQL based on their performance testing, see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4 ------------------------------------------------------------------------ r5490 \| vasil \| 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) \| 4 lines branches/zip: Add ChangeLog entry for 5489. ------------------------------------------------------------------------ r5491 \| calvin \| 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) \| 6 lines branches/zip: add copyright info to files related to PAUSE instruction patch, contributed by Sun Microsystems. ------------------------------------------------------------------------ r5492 \| calvin \| 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) \| 5 lines branches/zip: add ChangeLog entries for r5484-r5486. ------------------------------------------------------------------------ r5494 \| vasil \| 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) \| 6 lines branches/zip: Restore the original value of innodb_sync_spin_loops at the end, previously the test assumed that setting it to 20 will do this, but now the default is 30 and MTR's internal check failed. ------------------------------------------------------------------------ r5495 \| inaam \| 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) \| 5 lines branches/zip rb://138 (REVERT) Revert the flush neighbors patch as it shows regression in the benchmarks run by Michael. ------------------------------------------------------------------------ r5496 \| inaam \| 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) \| 4 lines branches/zip Fixed warnings on windows where ulint != ib_uint64_t ------------------------------------------------------------------------ r5497 \| calvin \| 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) \| 9 lines branches/zip: fix run-time symbols clash on Solaris. This patch is from Sergey Vojtovich of Sun Microsystems, to fix run-time symbols clash on Solaris with older C++ compiler: - when finding out a way to hide symbols, make decision basing on compiler, not operating system. - Sun Studio supports __hidden declaration specifier for this purpose. ------------------------------------------------------------------------ r5498 \| vasil \| 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) \| 92 lines branches/zip: Merge r5341:5497 from branches/5.1, skipping: c5419 because it is merge from branches/zip into branches/5.1 c5466 because the source code has been adjusted to match the MySQL behavior and the innodb-autoinc test does not fail in branches/zip, if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested not to merge c5466. and resolving conflicts in c5410, c5440, c5488: ------------------------------------------------------------------------ r5410 \| marko \| 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) \| 2 lines Changed paths: M /branches/5.1/include/trx0sys.ic M /branches/5.1/trx/trx0purge.c M /branches/5.1/trx/trx0sys.c M /branches/5.1/trx/trx0undo.c branches/5.1: Add missing #include "mtr0log.h" to avoid warnings when compiling with -DUNIV_MUST_NOT_INLINE. ------------------------------------------------------------------------ r5419 \| marko \| 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) \| 18 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test M /branches/5.1/mysql-test/innodb_bug42101.result M /branches/5.1/mysql-test/innodb_bug42101.test branches/5.1: Merge r5418 from branches/zip: ------------------------------------------------------------------------ r5418 \| marko \| 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) \| 5 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/handler/ha_innodb.cc M /branches/zip/mysql-test/innodb_bug42101-nonzero.result M /branches/zip/mysql-test/innodb_bug42101-nonzero.test M /branches/zip/mysql-test/innodb_bug42101.result M /branches/zip/mysql-test/innodb_bug42101.test branches/zip: Fix a race condition caused by SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749) When innodb_commit_concurrency is initially set nonzero, DEFAULT would change it back to 0, triggering Bug #42101. rb://139 approved by Heikki Tuuri. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5440 \| vasil \| 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) \| 8 lines Changed paths: M /branches/5.1/fil/fil0fil.c branches/5.1: Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation by changing the URL from http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html ------------------------------------------------------------------------ r5466 \| vasil \| 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) \| 6 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Adjust the failing innodb-autoinc test to conform to the latest behavior of the MySQL code. The idea and the comment in innodb-autoinc.test come from Sunny. ------------------------------------------------------------------------ r5488 \| vasil \| 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) \| 13 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug21704.result A /branches/5.1/mysql-test/innodb_bug21704.test branches/5.1: Fix Bug#21704 Renaming column does not update FK definition by checking whether a column that participates in a FK definition is being renamed and denying the ALTER in this case. The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>: http://lists.mysql.com/commits/77714 and was later adjusted to conform to InnoDB coding style by me (Vasil), I also added some more comments and moved the bug specific mysql-test to a separate file to make it more manageable and flexible. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5499 \| calvin \| 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) \| 3 lines branches/zip: add a missing file in Makefile.am This change was suggested by MySQL. ------------------------------------------------------------------------ r5500 \| calvin \| 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) \| 3 lines branches/zip: minor change Remove an extra "with". ------------------------------------------------------------------------ r5501 \| vasil \| 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) \| 5 lines branches/zip: Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h header file that is eventually used by mysqld. ------------------------------------------------------------------------ r5502 \| vasil \| 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) \| 4 lines branches/zip: Add include/ut0auxconf.h to noinst_HEADERS ------------------------------------------------------------------------ r5503 \| vasil \| 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) \| 8 lines branches/zip: Non-functional change: put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort alphabetically, so it is easier to find if a file is there or not and also diffs show exactly the added or removed file instead of surrounding lines too. ------------------------------------------------------------------------ r5504 \| calvin \| 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) \| 6 lines branches/zip: fix compile errors on Win64 Both srv_read_ahead_factor and srv_io_capacity should be defined as ulong. Approved by: Sunny ------------------------------------------------------------------------ r5508 \| calvin \| 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) \| 16 lines branches/zip: Support inlining of functions and prefetch with Sun Studio Those changes are contributed by Sun/MySQL. Two sets of changes in this patch when Sun Studio is used: - Explicit inlining of functions - Prefetch Support This patch has been tested by Sunny with the plugin statically built in. Since we've never built the plugin as a dynamically loaded module on Solaris, it is a separate task to change plug.in. rb://142 Approved by: Heikki ------------------------------------------------------------------------ r5509 \| calvin \| 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) \| 2 lines branches/zip: add ChangeLog entry for r5508. ------------------------------------------------------------------------ r5512 \| sunny \| 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) \| 2 lines branches/zip: Remove unused extern ref to timed_mutexes. ------------------------------------------------------------------------ r5513 \| sunny \| 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) \| 2 lines branches/zip: Undo r5512 ------------------------------------------------------------------------ r5514 \| sunny \| 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) \| 2 lines branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined. ------------------------------------------------------------------------ r5515 \| sunny \| 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) \| 2 lines branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup. ------------------------------------------------------------------------ r5516 \| sunny \| 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) \| 4 lines branches/zip: Make this file usable from within HotBackup. A new file has been introduced called hb_univ.i. This file should have all the HotBackup specific configuration. ------------------------------------------------------------------------ r5517 \| sunny \| 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) \| 2 lines Add / UNIV_HOTBACK */ ------------------------------------------------------------------------ r5519 \| vasil \| 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) \| 31 lines branches/zip: Merge r5497:5518 from branches/5.1: ------------------------------------------------------------------------ r5518 \| vasil \| 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) \| 22 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2874.2.1 committer: Anurag Shekhar <anurag.shekhar@sun.com> branch nick: mysql-5.1-bugteam-windows-warning timestamp: Wed 2009-05-13 15:41:24 +0530 message: Bug #39802 On Windows, 32-bit time_t should be enforced This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', possible loss of data". The fix is to typecast time_t to ulong before assigning it to ulong. Backported this from 6.0-bugteam tree. modified: storage/archive/ha_archive.cc storage/federated/ha_federated.cc storage/innobase/handler/ha_innodb.cc storage/myisam/ha_myisam.cc ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5520 \| vasil \| 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) \| 4 lines branches/zip: Add ChangeLog entries for r5498 and r5519. ------------------------------------------------------------------------ r5524 \| inaam \| 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) \| 9 lines branches/zip Change the read ahead parameter name to innodb_read_ahead_threshold. Change the meaning of this parameter to signify the number of pages that must be sequentially accessed for InnoDB to trigger a readahead request. Suggested by: Ken ------------------------------------------------------------------------	17 years ago
inaam	0c990811de	branches/innodb+: Merge revisions 5144:5524 from branches/zip ------------------------------------------------------------------------ r5147 \| marko \| 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) \| 1 line branches/zip: ibuf0ibuf.c: Improve a comment. ------------------------------------------------------------------------ r5149 \| marko \| 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) \| 34 lines branches/zip: Merge revisions 4994:5148 from branches/5.1: ------------------------------------------------------------------------ r5126 \| vasil \| 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) \| 9 lines branches/5.1: Preparation for the fix of Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Non-functional change: move FSP_* macros from fsp0fsp.h to a new file fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE in mtr0log.ic. ------------------------------------------------------------------------ r5127 \| vasil \| 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) \| 9 lines branches/5.1: Preparation for the fix of Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h and include fsp0fsp.h just before it is needed. This is needed in order to be able to use TRX_SYS_SPACE in mtr0log.ic. ------------------------------------------------------------------------ r5128 \| vasil \| 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) \| 7 lines branches/5.1: Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Do not write redo log for the pages in the doublewrite buffer. Also, do not make a dummy change to the page because this is not needed. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5169 \| marko \| 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) \| 1 line branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types. ------------------------------------------------------------------------ r5176 \| marko \| 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) \| 1 line branches/zip: Correct a debug assertion that was added in r5125. ------------------------------------------------------------------------ r5201 \| marko \| 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) \| 2 lines branches/zip: Clean up some comments. Make the rec parameter of mlog_open_and_write_index() const. ------------------------------------------------------------------------ r5234 \| marko \| 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) \| 44 lines branches/zip: Merge revisions 5148:5233 from branches/5.1: ------------------------------------------------------------------------ r5150 \| vasil \| 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) \| 4 lines branches/5.1: Whitespace fixup. ------------------------------------------------------------------------ r5191 \| vasil \| 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) \| 19 lines branches/5.1: Merge a change from MySQL (this fixes the failing innodb_mysql test): ------------------------------------------------------------ revno: 1810.3894.10 committer: Sergey Glukhov <Sergey.Glukhov@sun.com> branch nick: mysql-5.0-bugteam timestamp: Tue 2009-05-19 11:32:21 +0500 message: Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value Internal InnoDN FK parser does not recognize '\'' as quotation symbol. Suggested fix is to add '\'' symbol check for quotation condition (dict_strip_comments() function). modified: innobase/dict/dict0dict.c mysql-test/r/innodb_mysql.result mysql-test/t/innodb_mysql.test ------------------------------------------------------------------------ r5233 \| marko \| 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) \| 11 lines branches/5.1: Merge the test case from r5232 from branches/5.0: ------------------------------------------------------------------------ r5232 \| marko \| 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) \| 21 lines branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565 (Update Query Results in "1 Row Affected" But Should Be "Zero Rows"). Also, add a test case for Bug #40565. rb://128 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5250 \| marko \| 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) \| 1 line branches/zip: Add Doxygen comments to the rest of buf0. ------------------------------------------------------------------------ r5251 \| marko \| 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) \| 1 line branches/zip: Replace <= in a function comment. ------------------------------------------------------------------------ r5253 \| marko \| 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) \| 1 line branches/zip: Add missing Doxygen comments for page0zip. ------------------------------------------------------------------------ r5261 \| vasil \| 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) \| 15 lines branches/zip: Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern) The changes are: 1) Take into account access pattern when deciding whether or not to do linear read ahead. 2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic, global to control linear read ahead behvior 3) Disable random read ahead. Keep the code for now. Submitted by: Inaam (rb://122) Approved by: Heikki (rb://122) ------------------------------------------------------------------------ r5262 \| vasil \| 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) \| 22 lines branches/zip: Enable functionality to have multiple background io helper threads. This patch is based on percona contributions. More details about this patch will be written at: https://svn.innodb.com/innobase/MultipleBackgroundThreads The patch essentially does the following: expose following knobs: innodb_read_io_threads = [1 - 64] default 1 innodb_write_io_threads = [1 - 64] default 1 deprecate innodb_file_io_threads (this parameter was relevant only on windows) Internally it allows multiple segments for read and write IO request arrays where one thread works on one segement. Submitted by: Inaam (rb://124) Approved by: Heikki (rb://124) ------------------------------------------------------------------------ r5263 \| vasil \| 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) \| 4 lines branches/zip: Whitespace cleanup. ------------------------------------------------------------------------ r5264 \| vasil \| 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) \| 4 lines branches/zip: Add ChangeLog entry for r5261. ------------------------------------------------------------------------ r5265 \| vasil \| 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) \| 4 lines branches/zip: Add ChangeLog entry for r5262. ------------------------------------------------------------------------ r5268 \| inaam \| 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) \| 7 lines branches/zip Non functional change: Added legal notices acknowledging percona contribution to the multiple IO helper threads patch i.e.: r5262 ------------------------------------------------------------------------ r5283 \| inaam \| 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) \| 9 lines branches/zip rb://130 Enable Group Commit functionality that was broken in 5.0 when distributed transactions were introduced. Reviewed by: Heikki ------------------------------------------------------------------------ r5319 \| marko \| 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) \| 3 lines branches/zip: Declare os_thread_id_t as unsigned long, because ulint is wrong on Win64. Pointed out by Vladislav Vaintroub <wlad@sun.com>. ------------------------------------------------------------------------ r5320 \| inaam \| 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) \| 14 lines branches/zip rb://131 This patch changes the following defaults: max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99 additional_mem_pool_size: default from 1 to 8 MB buffer_pool_size: default from 8 to 128 MB log_buffer_size: default from 1 to 8 MB read_io_threads/write_io_threads: default from 1 to 4 The log file sizes are untouched because of upgrade issues Reviewed by: Heikki ------------------------------------------------------------------------ r5330 \| marko \| 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) \| 2 lines branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting buf_pool->n_pend_unzip while only holding buf_pool_mutex. ------------------------------------------------------------------------ r5331 \| marko \| 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) \| 2 lines branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call. The function must switch on the block state anyway. ------------------------------------------------------------------------ r5332 \| vasil \| 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) \| 4 lines branches/zip: Add ChangeLog entries for r5283 and r5320. ------------------------------------------------------------------------ r5333 \| marko \| 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) \| 1 line branches/zip: buf_page_io_query(): Remove unused function. ------------------------------------------------------------------------ r5335 \| marko \| 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) \| 2 lines branches/zip: innodb.test: Adjust the tolerance of innodb_buffer_pool_pages_total for r5320. ------------------------------------------------------------------------ r5342 \| marko \| 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) \| 60 lines branches/zip: Merge revisions 5233:5341 from branches/5.1: ------------------------------------------------------------------------ r5233 \| marko \| 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) \| 11 lines branches/5.1: Merge the test case from r5232 from branches/5.0: ------------------------------------------------------------------------ r5232 \| marko \| 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) \| 21 lines branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565 (Update Query Results in "1 Row Affected" But Should Be "Zero Rows"). Also, add a test case for Bug #40565. rb://128 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5243 \| sunny \| 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) \| 14 lines branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before the bug fix we would assert on missing autoinc columns. With this fix we allow MySQL to open the table but set the next autoinc value for the column to the MAX value. This effectively disables the next value generation. INSERTs will fail with a generic AUTOINC failure. However, the user should be able to read/dump the table, set the column values explicitly, use ALTER TABLE to set the next autoinc value and/or sync the two data dictionaries to resume normal operations. Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the index (PRIMARY) rb://118 ------------------------------------------------------------------------ r5252 \| sunny \| 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) \| 2 lines branches/5.1: The version of the result file checked in was broken in r5243. ------------------------------------------------------------------------ r5259 \| vasil \| 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) \| 7 lines branches/5.1: Remove the word "Error" from the printout because the mysqltest suite interprets it as an error and thus the innodb-autoinc test fails. Approved by: Sunny (via IM) ------------------------------------------------------------------------ r5339 \| marko \| 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) \| 2 lines branches/5.1: Add missing #include "mtr0log.h" so that the code compiles with -DUNIV_MUST_NOT_INLINE. (null merge; this had already been committed in branches/zip) ------------------------------------------------------------------------ r5340 \| marko \| 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) \| 4 lines branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown, refuse to unlock the record. (Bug #45357, caused by the fix of Bug #39320). rb://132 approved by Sunny Bains. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5343 \| vasil \| 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) \| 4 lines branches/zip: Add ChangeLog entry for r5342. ------------------------------------------------------------------------ r5344 \| marko \| 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) \| 1 line branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426) ------------------------------------------------------------------------ r5391 \| marko \| 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) \| 2 lines branches/zip: buf_page_get_zip(): Fix a bogus warning about block_mutex being possibly uninitialized. ------------------------------------------------------------------------ r5392 \| marko \| 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) \| 4 lines branches/zip: ha_innobase::check_if_incompatible_data(): When ROW_FORMAT=DEFAULT, do not compare to get_row_type(). Without this change, fast index creation will be disabled in recent versions of MySQL 5.1. ------------------------------------------------------------------------ r5393 \| pekka \| 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) \| 4 lines branches/zip: Minor changes for Hot Backup to build correctly. (The code bracketed between #ifdef UNIV_HOTBACKUP and #endif / UNIV_HOTBACKUP /). This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------------------ r5394 \| pekka \| 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) \| 4 lines branches/zip: Add functions for checking the format of tablespaces for Hot Backup build (UNIV_HOTBACKUP defined). This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------------------ r5397 \| calvin \| 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) \| 7 lines branches/zip: change the header file path. Change the header file path from ../storage/innobase/include/ to ../include/. In the planned 5.1 + plugin release, the source directory of the plugin will not be in storage/innobase. Approved by: Heikki (IM) ------------------------------------------------------------------------ r5407 \| calvin \| 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) \| 4 lines branches/zip: remove relative path of header files. Suggested by Marko. ------------------------------------------------------------------------ r5412 \| marko \| 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) \| 1 line branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290. ------------------------------------------------------------------------ r5415 \| marko \| 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) \| 3 lines branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch. This addresses Bug #44571 but does not fix it. rb://135 approved by Sunny Bains. ------------------------------------------------------------------------ r5417 \| marko \| 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) \| 1 line branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment. ------------------------------------------------------------------------ r5418 \| marko \| 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) \| 5 lines branches/zip: Fix a race condition caused by SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749) When innodb_commit_concurrency is initially set nonzero, DEFAULT would change it back to 0, triggering Bug #42101. rb://139 approved by Heikki Tuuri. ------------------------------------------------------------------------ r5423 \| calvin \| 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) \| 2 lines branches/zip: Fix typos. ------------------------------------------------------------------------ r5425 \| marko \| 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) \| 4 lines branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index(): Start prebuilt->trx before locking the table. This should fix Issue #293 and could fix Issue #229. Approved by Sunny (over IM). ------------------------------------------------------------------------ r5426 \| marko \| 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) \| 3 lines branches/zip: buf_page_get_gen(): Fix a race condition when reading buf_fix_count. This could explain Issue #156. Tested by Michael. ------------------------------------------------------------------------ r5427 \| marko \| 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) \| 5 lines branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages(): Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED). buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)). Issue #289, rb://136 approved by Sunny Bains ------------------------------------------------------------------------ r5428 \| marko \| 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) \| 2 lines branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast. Do not do arithmetics on void pointers. ------------------------------------------------------------------------ r5429 \| marko \| 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) \| 13 lines branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT or SET GLOBAL innodb_file_format_check=DEFAULT. innodb_file_format.test: New test for innodb_file_format and innodb_file_format_check. innodb_file_format_name_validate(): Store the string in save. innodb_file_format_name_update(): Check the string again. innodb_file_format_check_validate(): Store the string in save. innodb_file_format_check_update(): Check the string again. Issue #282, rb://140 approved by Heikki Tuuri ------------------------------------------------------------------------ r5430 \| marko \| 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) \| 2 lines branches/zip: lock_rec_validate_page(): Add another assertion to track down Issue #289. ------------------------------------------------------------------------ r5431 \| marko \| 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) \| 1 line branches/zip: Revert an accidentally made change in r5430 to univ.i. ------------------------------------------------------------------------ r5437 \| marko \| 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: ibuf_dummy_index_free(): Beautify the comment. ------------------------------------------------------------------------ r5438 \| marko \| 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: fseg_free(): Remove this unused function. ------------------------------------------------------------------------ r5439 \| marko \| 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG. This function is unused, but it could turn out to be a useful debugging aid. ------------------------------------------------------------------------ r5441 \| marko \| 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: ha_delete(): Remove this unused function that was very similar to ha_search_and_delete_if_found(). ------------------------------------------------------------------------ r5442 \| marko \| 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove. ------------------------------------------------------------------------ r5443 \| marko \| 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: os_event_create_auto(): Unused, remove. ------------------------------------------------------------------------ r5444 \| marko \| 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: que_graph_try_free(): Unused, remove. ------------------------------------------------------------------------ r5445 \| marko \| 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: row_build_row_ref_from_row(): Unused, remove. ------------------------------------------------------------------------ r5446 \| marko \| 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove. ------------------------------------------------------------------------ r5447 \| marko \| 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: srv_que_task_queue_check(): Unused, remove. ------------------------------------------------------------------------ r5448 \| marko \| 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: mem_heap_cat(): Unused, remove. ------------------------------------------------------------------------ r5449 \| marko \| 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: innobase_start_or_create_for_mysql(): Invoke os_get_os_version() at most once. ------------------------------------------------------------------------ r5450 \| marko \| 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: os_file_close_no_error_handling(): Unused, remove. ------------------------------------------------------------------------ r5451 \| marko \| 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: page_set_max_trx_id(): Make the code compile with UNIV_HOTBACKUP. ------------------------------------------------------------------------ r5452 \| marko \| 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: os_file_close_no_error_handling(): Restore, as this function is used within InnoDB Hot Backup. ------------------------------------------------------------------------ r5453 \| marko \| 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) \| 1 line branches/zip: os_process_set_priority_boost(): Unused, remove. ------------------------------------------------------------------------ r5454 \| marko \| 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) \| 2 lines branches/zip: Replace a non-ASCII character (ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute. ------------------------------------------------------------------------ r5456 \| inaam \| 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) \| 4 lines branches/zip Non functional change. s/Percona/Percona Inc./ ------------------------------------------------------------------------ r5470 \| vasil \| 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) \| 16 lines branches/zip: Use PAUSE instruction inside spinloop if it is available. The patch was originally developed by Mikael Ronstrom <mikael@mysql.com> and can be found here: http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800 Approved by: Heikki (rb://137) ------------------------------------------------------------------------ r5481 \| vasil \| 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) \| 4 lines branches/zip: Remove unnecessary quotes and simplify plug.in. ------------------------------------------------------------------------ r5482 \| calvin \| 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) \| 5 lines branches/zip: add COPYING files for Percona and Sun Micro. 1.0.4 contains patches based on contributions from Percona and Sun Microsystems. ------------------------------------------------------------------------ r5483 \| calvin \| 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) \| 3 lines branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake. Windows will support PAUSE instruction by default. ------------------------------------------------------------------------ r5484 \| inaam \| 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) \| 13 lines branches/zip rb://126 Based on contribution from Google Inc. This patch introduces a new parameter innodb_io_capacity to control the rate at which master threads performs various tasks. The default value is 200 and higher values imply more aggressive flushing and ibuf merges from within the master thread. This patch also changes the ibuf merge from synchronous to asynchronous. Another minor change is not to force the master thread to wait for a log flush to complete every second. Approved by: Heikki ------------------------------------------------------------------------ r5485 \| inaam \| 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) \| 18 lines branches/zip rb://138 The current implementation is to try to flush the neighbors of every page that we flush. This patch makes the following distinction: 1) If the flush is from flush_list AND 2) If the flush is intended to move the oldest_modification LSN ahead (this happens when a user thread sees little space in the log file and attempts to flush pages from the buffer pool so that a checkpoint can be made) THEN Do not try to flush the neighbors. Just focus on flushing dirty pages at the end of flush_list Approved by: Heikki ------------------------------------------------------------------------ r5486 \| inaam \| 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) \| 29 lines branches/zip rb://133 This patch introduces heuristics based flushing rate of dirty pages to avoid IO bursts at checkpoint. 1) log_capacity / log_generated per second gives us number of seconds in which ALL dirty pages need to be flushed. Based on this rough assumption we can say that n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate 2) We use weighted averages (hard coded to 20 seconds) of log_generation_rate to avoid resonance. 3) From the desired_flush_rate we subtract the number of pages that have been flushed due to LRU flushing. That gives us pages that we should flush as part of flush_list cleanup. And that is the number (capped by maximum io_capacity) that we try to flush from the master thread. Knobs: ====== innodb_adaptive_flushing: boolean, global, dynamic, default TRUE. Since this heuristic is very experimental and has the potential to dramatically change the IO pattern I think it is a good idea to leave a knob to turn it off. Approved by: Heikki ------------------------------------------------------------------------ r5487 \| calvin \| 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) \| 7 lines branches/zip: fix PAUSE instruction patch on Windows The original PAUSE instruction patch (r5470) does not compile on Windows. Also, there is an elegant way of doing it on Windows - YieldProcessor(). Approved by: Heikki (on IM) ------------------------------------------------------------------------ r5489 \| vasil \| 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) \| 9 lines branches/zip: Change the defaults for innodb_sync_spin_loops: 20 -> 30 innodb_spin_wait_delay: 5 -> 6 This change was proposed by Sun/MySQL based on their performance testing, see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4 ------------------------------------------------------------------------ r5490 \| vasil \| 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) \| 4 lines branches/zip: Add ChangeLog entry for 5489. ------------------------------------------------------------------------ r5491 \| calvin \| 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) \| 6 lines branches/zip: add copyright info to files related to PAUSE instruction patch, contributed by Sun Microsystems. ------------------------------------------------------------------------ r5492 \| calvin \| 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) \| 5 lines branches/zip: add ChangeLog entries for r5484-r5486. ------------------------------------------------------------------------ r5494 \| vasil \| 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) \| 6 lines branches/zip: Restore the original value of innodb_sync_spin_loops at the end, previously the test assumed that setting it to 20 will do this, but now the default is 30 and MTR's internal check failed. ------------------------------------------------------------------------ r5495 \| inaam \| 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) \| 5 lines branches/zip rb://138 (REVERT) Revert the flush neighbors patch as it shows regression in the benchmarks run by Michael. ------------------------------------------------------------------------ r5496 \| inaam \| 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) \| 4 lines branches/zip Fixed warnings on windows where ulint != ib_uint64_t ------------------------------------------------------------------------ r5497 \| calvin \| 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) \| 9 lines branches/zip: fix run-time symbols clash on Solaris. This patch is from Sergey Vojtovich of Sun Microsystems, to fix run-time symbols clash on Solaris with older C++ compiler: - when finding out a way to hide symbols, make decision basing on compiler, not operating system. - Sun Studio supports __hidden declaration specifier for this purpose. ------------------------------------------------------------------------ r5498 \| vasil \| 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) \| 92 lines branches/zip: Merge r5341:5497 from branches/5.1, skipping: c5419 because it is merge from branches/zip into branches/5.1 c5466 because the source code has been adjusted to match the MySQL behavior and the innodb-autoinc test does not fail in branches/zip, if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested not to merge c5466. and resolving conflicts in c5410, c5440, c5488: ------------------------------------------------------------------------ r5410 \| marko \| 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) \| 2 lines Changed paths: M /branches/5.1/include/trx0sys.ic M /branches/5.1/trx/trx0purge.c M /branches/5.1/trx/trx0sys.c M /branches/5.1/trx/trx0undo.c branches/5.1: Add missing #include "mtr0log.h" to avoid warnings when compiling with -DUNIV_MUST_NOT_INLINE. ------------------------------------------------------------------------ r5419 \| marko \| 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) \| 18 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test M /branches/5.1/mysql-test/innodb_bug42101.result M /branches/5.1/mysql-test/innodb_bug42101.test branches/5.1: Merge r5418 from branches/zip: ------------------------------------------------------------------------ r5418 \| marko \| 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) \| 5 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/handler/ha_innodb.cc M /branches/zip/mysql-test/innodb_bug42101-nonzero.result M /branches/zip/mysql-test/innodb_bug42101-nonzero.test M /branches/zip/mysql-test/innodb_bug42101.result M /branches/zip/mysql-test/innodb_bug42101.test branches/zip: Fix a race condition caused by SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749) When innodb_commit_concurrency is initially set nonzero, DEFAULT would change it back to 0, triggering Bug #42101. rb://139 approved by Heikki Tuuri. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5440 \| vasil \| 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) \| 8 lines Changed paths: M /branches/5.1/fil/fil0fil.c branches/5.1: Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation by changing the URL from http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html ------------------------------------------------------------------------ r5466 \| vasil \| 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) \| 6 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Adjust the failing innodb-autoinc test to conform to the latest behavior of the MySQL code. The idea and the comment in innodb-autoinc.test come from Sunny. ------------------------------------------------------------------------ r5488 \| vasil \| 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) \| 13 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug21704.result A /branches/5.1/mysql-test/innodb_bug21704.test branches/5.1: Fix Bug#21704 Renaming column does not update FK definition by checking whether a column that participates in a FK definition is being renamed and denying the ALTER in this case. The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>: http://lists.mysql.com/commits/77714 and was later adjusted to conform to InnoDB coding style by me (Vasil), I also added some more comments and moved the bug specific mysql-test to a separate file to make it more manageable and flexible. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5499 \| calvin \| 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) \| 3 lines branches/zip: add a missing file in Makefile.am This change was suggested by MySQL. ------------------------------------------------------------------------ r5500 \| calvin \| 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) \| 3 lines branches/zip: minor change Remove an extra "with". ------------------------------------------------------------------------ r5501 \| vasil \| 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) \| 5 lines branches/zip: Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h header file that is eventually used by mysqld. ------------------------------------------------------------------------ r5502 \| vasil \| 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) \| 4 lines branches/zip: Add include/ut0auxconf.h to noinst_HEADERS ------------------------------------------------------------------------ r5503 \| vasil \| 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) \| 8 lines branches/zip: Non-functional change: put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort alphabetically, so it is easier to find if a file is there or not and also diffs show exactly the added or removed file instead of surrounding lines too. ------------------------------------------------------------------------ r5504 \| calvin \| 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) \| 6 lines branches/zip: fix compile errors on Win64 Both srv_read_ahead_factor and srv_io_capacity should be defined as ulong. Approved by: Sunny ------------------------------------------------------------------------ r5508 \| calvin \| 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) \| 16 lines branches/zip: Support inlining of functions and prefetch with Sun Studio Those changes are contributed by Sun/MySQL. Two sets of changes in this patch when Sun Studio is used: - Explicit inlining of functions - Prefetch Support This patch has been tested by Sunny with the plugin statically built in. Since we've never built the plugin as a dynamically loaded module on Solaris, it is a separate task to change plug.in. rb://142 Approved by: Heikki ------------------------------------------------------------------------ r5509 \| calvin \| 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) \| 2 lines branches/zip: add ChangeLog entry for r5508. ------------------------------------------------------------------------ r5512 \| sunny \| 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) \| 2 lines branches/zip: Remove unused extern ref to timed_mutexes. ------------------------------------------------------------------------ r5513 \| sunny \| 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) \| 2 lines branches/zip: Undo r5512 ------------------------------------------------------------------------ r5514 \| sunny \| 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) \| 2 lines branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined. ------------------------------------------------------------------------ r5515 \| sunny \| 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) \| 2 lines branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup. ------------------------------------------------------------------------ r5516 \| sunny \| 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) \| 4 lines branches/zip: Make this file usable from within HotBackup. A new file has been introduced called hb_univ.i. This file should have all the HotBackup specific configuration. ------------------------------------------------------------------------ r5517 \| sunny \| 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) \| 2 lines Add / UNIV_HOTBACK */ ------------------------------------------------------------------------ r5519 \| vasil \| 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) \| 31 lines branches/zip: Merge r5497:5518 from branches/5.1: ------------------------------------------------------------------------ r5518 \| vasil \| 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) \| 22 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2874.2.1 committer: Anurag Shekhar <anurag.shekhar@sun.com> branch nick: mysql-5.1-bugteam-windows-warning timestamp: Wed 2009-05-13 15:41:24 +0530 message: Bug #39802 On Windows, 32-bit time_t should be enforced This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', possible loss of data". The fix is to typecast time_t to ulong before assigning it to ulong. Backported this from 6.0-bugteam tree. modified: storage/archive/ha_archive.cc storage/federated/ha_federated.cc storage/innobase/handler/ha_innodb.cc storage/myisam/ha_myisam.cc ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5520 \| vasil \| 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) \| 4 lines branches/zip: Add ChangeLog entries for r5498 and r5519. ------------------------------------------------------------------------ r5524 \| inaam \| 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) \| 9 lines branches/zip Change the read ahead parameter name to innodb_read_ahead_threshold. Change the meaning of this parameter to signify the number of pages that must be sequentially accessed for InnoDB to trigger a readahead request. Suggested by: Ken ------------------------------------------------------------------------	17 years ago
inaam	e6e892f2e2	branches/zip Fixed warnings on windows where ulint != ib_uint64_t	17 years ago
inaam	9af090cb0e	branches/zip Fixed warnings on windows where ulint != ib_uint64_t	17 years ago
inaam	cda2536827	branches/zip rb://138 (REVERT) Revert the flush neighbors patch as it shows regression in the benchmarks run by Michael.	17 years ago
inaam	ec40f5cd73	branches/zip rb://138 (REVERT) Revert the flush neighbors patch as it shows regression in the benchmarks run by Michael.	17 years ago
inaam	6e6d1e8655	branches/zip rb://133 This patch introduces heuristics based flushing rate of dirty pages to avoid IO bursts at checkpoint. 1) log_capacity / log_generated per second gives us number of seconds in which ALL dirty pages need to be flushed. Based on this rough assumption we can say that n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate 2) We use weighted averages (hard coded to 20 seconds) of log_generation_rate to avoid resonance. 3) From the desired_flush_rate we subtract the number of pages that have been flushed due to LRU flushing. That gives us pages that we should flush as part of flush_list cleanup. And that is the number (capped by maximum io_capacity) that we try to flush from the master thread. Knobs: ====== innodb_adaptive_flushing: boolean, global, dynamic, default TRUE. Since this heuristic is very experimental and has the potential to dramatically change the IO pattern I think it is a good idea to leave a knob to turn it off. Approved by: Heikki	17 years ago
inaam	43fceb74f2	branches/zip rb://133 This patch introduces heuristics based flushing rate of dirty pages to avoid IO bursts at checkpoint. 1) log_capacity / log_generated per second gives us number of seconds in which ALL dirty pages need to be flushed. Based on this rough assumption we can say that n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate 2) We use weighted averages (hard coded to 20 seconds) of log_generation_rate to avoid resonance. 3) From the desired_flush_rate we subtract the number of pages that have been flushed due to LRU flushing. That gives us pages that we should flush as part of flush_list cleanup. And that is the number (capped by maximum io_capacity) that we try to flush from the master thread. Knobs: ====== innodb_adaptive_flushing: boolean, global, dynamic, default TRUE. Since this heuristic is very experimental and has the potential to dramatically change the IO pattern I think it is a good idea to leave a knob to turn it off. Approved by: Heikki	17 years ago
inaam	b6cb94ed20	branches/zip rb://138 The current implementation is to try to flush the neighbors of every page that we flush. This patch makes the following distinction: 1) If the flush is from flush_list AND 2) If the flush is intended to move the oldest_modification LSN ahead (this happens when a user thread sees little space in the log file and attempts to flush pages from the buffer pool so that a checkpoint can be made) THEN Do not try to flush the neighbors. Just focus on flushing dirty pages at the end of flush_list Approved by: Heikki	17 years ago
inaam	449e6af3c6	branches/zip rb://138 The current implementation is to try to flush the neighbors of every page that we flush. This patch makes the following distinction: 1) If the flush is from flush_list AND 2) If the flush is intended to move the oldest_modification LSN ahead (this happens when a user thread sees little space in the log file and attempts to flush pages from the buffer pool so that a checkpoint can be made) THEN Do not try to flush the neighbors. Just focus on flushing dirty pages at the end of flush_list Approved by: Heikki	17 years ago
Vadim Tkachenko	f657606df9	sync with rev73 extensions	17 years ago
marko	1601bdc38a	branches/innodb+: Merge revisions 5091:5143 from branches/zip: ------------------------------------------------------------------------ r5092 \| marko \| 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Adjust some function comments after r5091. ------------------------------------------------------------------------ r5100 \| marko \| 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Split some long lines that were introduced in r5091. ------------------------------------------------------------------------ r5101 \| marko \| 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR. This is to avoid triggering an error in Doxygen. ------------------------------------------------------------------------ r5102 \| marko \| 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Add missing file comments. ------------------------------------------------------------------------ r5103 \| marko \| 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) \| 10 lines branches/zip: Add @file comments, and convert decorative /******************************* comments to Doxygen / style like this: /***************************// This conversion was performed by the following command: perl -i -e 'while(<ARGV>){if (m\|^/\{30}\$\|) { s\|\{4}$\|//*\| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' /[ch] include/univ.i ------------------------------------------------------------------------ r5104 \| marko \| 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Revert ut0auxconf_ to r5102, that is, make Doxygen ignore these test programs. ------------------------------------------------------------------------ r5105 \| marko \| 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Enclose some #error checks inside #ifndef DOXYGEN to prevent bogus Doxygen errors. ------------------------------------------------------------------------ r5106 \| marko \| 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Add some Doxygen comments, mainly to structs, typedefs, macros and global variables. Many more to go. ------------------------------------------------------------------------ r5108 \| marko \| 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) \| 2 lines branches/zip: lexyy.c: Remove the inadvertently added @file directive. There is nothing for Doxygen to see in this file, move along. ------------------------------------------------------------------------ r5125 \| marko \| 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) \| 3 lines branches/zip: Add some Doxygen comments for many structs, typedefs, #defines and global variables. Many are still missing. ------------------------------------------------------------------------ r5134 \| marko \| 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) \| 1 line branches/zip: Add some Doxygen @return comments. ------------------------------------------------------------------------ r5139 \| marko \| 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) \| 1 line branches/zip: Add Doxyfile. ------------------------------------------------------------------------ r5143 \| marko \| 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) \| 3 lines branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation. @defgroup is for source code modules, not for field groups. Tell Doxygen to expand the UT_LIST declarations. ------------------------------------------------------------------------	17 years ago
marko	41b29de7ac	branches/innodb+: Merge revisions 5091:5143 from branches/zip: ------------------------------------------------------------------------ r5092 \| marko \| 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Adjust some function comments after r5091. ------------------------------------------------------------------------ r5100 \| marko \| 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Split some long lines that were introduced in r5091. ------------------------------------------------------------------------ r5101 \| marko \| 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR. This is to avoid triggering an error in Doxygen. ------------------------------------------------------------------------ r5102 \| marko \| 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Add missing file comments. ------------------------------------------------------------------------ r5103 \| marko \| 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) \| 10 lines branches/zip: Add @file comments, and convert decorative /******************************* comments to Doxygen / style like this: /***************************// This conversion was performed by the following command: perl -i -e 'while(<ARGV>){if (m\|^/\{30}\$\|) { s\|\{4}$\|//*\| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' /[ch] include/univ.i ------------------------------------------------------------------------ r5104 \| marko \| 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Revert ut0auxconf_ to r5102, that is, make Doxygen ignore these test programs. ------------------------------------------------------------------------ r5105 \| marko \| 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Enclose some #error checks inside #ifndef DOXYGEN to prevent bogus Doxygen errors. ------------------------------------------------------------------------ r5106 \| marko \| 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Add some Doxygen comments, mainly to structs, typedefs, macros and global variables. Many more to go. ------------------------------------------------------------------------ r5108 \| marko \| 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) \| 2 lines branches/zip: lexyy.c: Remove the inadvertently added @file directive. There is nothing for Doxygen to see in this file, move along. ------------------------------------------------------------------------ r5125 \| marko \| 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) \| 3 lines branches/zip: Add some Doxygen comments for many structs, typedefs, #defines and global variables. Many are still missing. ------------------------------------------------------------------------ r5134 \| marko \| 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) \| 1 line branches/zip: Add some Doxygen @return comments. ------------------------------------------------------------------------ r5139 \| marko \| 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) \| 1 line branches/zip: Add Doxyfile. ------------------------------------------------------------------------ r5143 \| marko \| 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) \| 3 lines branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation. @defgroup is for source code modules, not for field groups. Tell Doxygen to expand the UT_LIST declarations. ------------------------------------------------------------------------	17 years ago
marko	5727d980b6	branches/zip: Add @file comments, and convert decorative /******************************* comments to Doxygen / style like this: /***************************// This conversion was performed by the following command: perl -i -e 'while(<ARGV>){if (m\|^/\{30}\$\|) { s\|\{4}$\|//*\| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' /*[ch] include/univ.i	17 years ago
marko	11ff89d994	branches/zip: Add @file comments, and convert decorative /******************************* comments to Doxygen / style like this: /***************************// This conversion was performed by the following command: perl -i -e 'while(<ARGV>){if (m\|^/\{30}\$\|) { s\|\{4}$\|//*\| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' /*[ch] include/univ.i	17 years ago
marko	5f1c5429d7	branches/zip: Split some long lines that were introduced in r5091.	17 years ago
marko	d075e80c49	branches/zip: Split some long lines that were introduced in r5091.	17 years ago
marko	61bddcc89b	branches/innodb+: Merge revisions 5090:5091 from branches/zip: (Ran doxygenify.pl conversion locally, then merged and checked consistency.) ------------------------------------------------------------------------ r5091 \| marko \| 2009-05-25 09:30:14 +0300 (Mon, 25 May 2009) \| 33 lines branches/zip: Convert the function comments to Doxygen format. This patch was created by running the following commands: for i in /[ch]; do doxygenify.pl $i; done perl -i -pe 's#\{3} \/$#***/#' /[ch] where doxygenify.pl is https://svn.innodb.com/svn/misc/trunk/tools/doxygenify.pl r510 Verified the consistency as follows: (0) not too many / in: / or / out: / comments left in the code: grep -l '/\\s$in\\|out$[,:/]' /[ch] (1) no difference when ignoring blank lines, after stripping all C90-style / comments /, including multi-line ones, before and after applying this patch: perl -i -e 'undef $/;while(<ARGV>){s#/\(.?)\/##gs;print}' /[ch] diff -I'^\s$' --exclude .svn -ru TREE1 TREE2 (2) after stripping @return comments and !<, generated a diff and omitted the hunks where / out: / function return comments were removed: perl -i -e'undef $/;while(<ARGV>){s#!<##g;s#\n\@return\t.?\/# \/#gs;print}'\ /[ch] svn diff\| perl -e 'undef $/;$_=<>;s#\n-\s/\ out[:,]([^\n]?)(\n-[^\n]?)\/##gs;print' Some unintended changes were left. These will be removed in a subsequent patch. ------------------------------------------------------------------------	17 years ago
marko	e6c01608be	branches/innodb+: Merge revisions 5090:5091 from branches/zip: (Ran doxygenify.pl conversion locally, then merged and checked consistency.) ------------------------------------------------------------------------ r5091 \| marko \| 2009-05-25 09:30:14 +0300 (Mon, 25 May 2009) \| 33 lines branches/zip: Convert the function comments to Doxygen format. This patch was created by running the following commands: for i in /[ch]; do doxygenify.pl $i; done perl -i -pe 's#\{3} \/$#***/#' /[ch] where doxygenify.pl is https://svn.innodb.com/svn/misc/trunk/tools/doxygenify.pl r510 Verified the consistency as follows: (0) not too many / in: / or / out: / comments left in the code: grep -l '/\\s$in\\|out$[,:/]' /[ch] (1) no difference when ignoring blank lines, after stripping all C90-style / comments /, including multi-line ones, before and after applying this patch: perl -i -e 'undef $/;while(<ARGV>){s#/\(.?)\/##gs;print}' /[ch] diff -I'^\s$' --exclude .svn -ru TREE1 TREE2 (2) after stripping @return comments and !<, generated a diff and omitted the hunks where / out: / function return comments were removed: perl -i -e'undef $/;while(<ARGV>){s#!<##g;s#\n\@return\t.?\/# \/#gs;print}'\ /[ch] svn diff\| perl -e 'undef $/;$_=<>;s#\n-\s/\ out[:,]([^\n]?)(\n-[^\n]?)\/##gs;print' Some unintended changes were left. These will be removed in a subsequent patch. ------------------------------------------------------------------------	17 years ago
marko	8ab5601eea	branches/zip: Convert the function comments to Doxygen format. This patch was created by running the following commands: for i in /[ch]; do doxygenify.pl $i; done perl -i -pe 's#\{3} \/$#***/#' /[ch] where doxygenify.pl is https://svn.innodb.com/svn/misc/trunk/tools/doxygenify.pl r510 Verified the consistency as follows: (0) not too many / in: / or / out: / comments left in the code: grep -l '/\\s$in\\|out$[,:/]' /[ch] (1) no difference when ignoring blank lines, after stripping all C90-style / comments /, including multi-line ones, before and after applying this patch: perl -i -e 'undef $/;while(<ARGV>){s#/\(.?)\/##gs;print}' /[ch] diff -I'^\s$' --exclude .svn -ru TREE1 TREE2 (2) after stripping @return comments and !<, generated a diff and omitted the hunks where / out: / function return comments were removed: perl -i -e'undef $/;while(<ARGV>){s#!<##g;s#\n\@return\t.?\/# \/#gs;print}'\ /[ch] svn diff\| perl -e 'undef $/;$_=<>;s#\n-\s/\ out[:,]([^\n]?)(\n-[^\n]?)\/##gs;print' Some unintended changes were left. These will be removed in a subsequent patch.	17 years ago

... 2 3 4 5 6

275 Commits (c091a0bc8da87045f10bfc96618ed7194768fa2d)