~drizzle-trunk/drizzle/development : changes

~drizzle-trunk/drizzle/development » Changes from revision 1819.5.265

Rev	Summary	Authors	Date
1819.5.265	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6925 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6925 Also fix wait_condition for drizzle, and queries in the test. Original Authors: mmakela Original commit message: branches/zip: Merge revisions 6921:6924 from branches/5.1: ------------------------------------------------------------------------ r6924 \| mmakela \| 2010-03-31 15:28:25 +0300 (Wed, 31 Mar 2010) \| 1 line Changed paths: M /branches/5.1/mysql-test/innodb_bug51920.test branches/5.1: innodb_bug51920.test: Fix a race condition. ------------------------------------------------------------------------	mmakela	13 years ago
1819.5.264	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6922 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6922 Original Authors: mmakela Original commit message: branches/zip: Merge revisions 6918:6921 from branches/5.1: ------------------------------------------------------------------------ r6921 \| mmakela \| 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) \| 2 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug51920.result M /branches/5.1/mysql-test/innodb_bug51920.test branches/5.1: innodb_bug51920.test: Make the test quicker and more deterministic. Suggested by Vasil Dimov. ------------------------------------------------------------------------	mmakela	13 years ago
1819.5.263	Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:b... Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6919 Original Authors: mmakela Original commit message: branches/zip: Merge revisions 6788:6918 from branches/5.1: ------------------------------------------------------------------------ r6822 \| vasil \| 2010-03-15 10:17:31 +0200 (Mon, 15 Mar 2010) \| 12 lines Changed paths: M /branches/5.1/row/row0sel.c branches/5.1: Typecast to silence a compiler warning: row/row0sel.c: 4548 C4244: '=' : conversion from 'float' to 'ib_ulonglong', possible loss of data row/row0sel.c: 4553 C4244: '=' : conversion from 'double' to 'ib_ulonglong', possible loss of data Reported by: Jonas Oreland <Jonas.Oreland@Sun.COM> Discussed with: Sunny Bains <sunny.bains@oracle.com> ------------------------------------------------------------------------ r6884 \| vdimov \| 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) \| 6 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: Fix a non-determinism in innodb_bug38231. Reported by: Sergey Vojtovich <svoj@Sun.COM> ------------------------------------------------------------------------ r6911 \| vdimov \| 2010-03-30 11:39:02 +0300 (Tue, 30 Mar 2010) \| 2 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Whitespace fixup ------------------------------------------------------------------------ r6912 \| vdimov \| 2010-03-30 12:18:46 +0300 (Tue, 30 Mar 2010) \| 2 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Whitespace fixup on line 354 ------------------------------------------------------------------------ r6918 \| mmakela \| 2010-03-31 11:14:51 +0300 (Wed, 31 Mar 2010) \| 6 lines Changed paths: A /branches/5.1/mysql-test/innodb_bug51920.result A /branches/5.1/mysql-test/innodb_bug51920.test M /branches/5.1/srv/srv0srv.c branches/5.1: Obey KILL during a lock wait (Bug #51920). srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread(): Check trx_is_interrupted() in addition to checking the lock wait timeout. rb://279 approved by Sunny Bains ------------------------------------------------------------------------	mmakela	13 years ago
1819.5.262	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6900 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6900 Original Authors: mmakela Original commit message: branches/zip: Merge c6899 from branches/innodb+: Add debug assertions to track down Bug #52360. hash_table_t::magic_n: Add HASH_TABLE_MAGIC_N checks, which were fully absent. ut_hash_ulint(): Assert table_size > 0 before division.	mmakela	13 years ago
1819.5.261	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6897 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6897 Original Authors: mmakela Original commit message: 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.	mmakela	13 years ago
1819.5.260	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6891 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6891 Original Authors: vdimov Original commit message: 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	vdimov	13 years ago
1819.5.259	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6875 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6875 Original Authors: vdimov Original commit message: branches/zip: Wrap line at 78 column in ChangeLog.	vdimov	13 years ago
1819.5.258	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6874 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6874 Original Authors: vdimov Original commit message: branches/zip: Wrap ChangeLog at 78th column	vdimov	13 years ago
1819.5.257	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6873 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6873 Original Authors: vdimov Original commit message: branches/zip: Use Bug#N instead of Bug #N to be consistent with the rest of the fil.	vdimov	13 years ago
1819.5.256	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6872 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6872 Original Authors: vdimov Original commit message: branches/zip: Fix ChangeLog - write only the bug title in bugs.mysql.com-related entires.	vdimov	13 years ago
1819.5.255	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6871 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6871 Original Authors: vdimov Original commit message: branches/zip: Whitespace fixup to be consistent with the rest of the file.	vdimov	13 years ago
1819.5.254	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6868 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6868 Original Authors: mmakela Original commit message: branches/zip: page_validate(): Check the buf[] bounds.	mmakela	13 years ago
1819.5.253	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6864 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6864 Original Authors: mmakela Original commit message: branches/zip: dtype_new_store_for_order_and_null_size(): Add ut_ad() on mtype.	mmakela	13 years ago
1819.5.252	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6861 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6861 Original Authors: vdimov Original commit message: 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:100: 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 > > ^	vdimov	13 years ago
1819.5.251	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6860 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6860 Original Authors: jyang Original commit message: 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.	jyang	13 years ago
1819.5.250	fix merge of fix merge of revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6805 - went in the wrong place.	Stewart Smith	13 years ago
1819.5.249	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6858 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6858 Original Authors: mmakela Original commit message: branches/zip: innodb_read_ahead_threshold: Add missing space to help string.	mmakela	13 years ago
1819.5.248	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6857 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6857 Original Authors: mmakela Original commit message: branches/zip: innodb_change_buffering: Correct the documentation.	mmakela	13 years ago
1819.5.247	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6853 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6853 Original Authors: marko Original commit message: branches/zip: mutex_own(), rw_lock_own(): Add attribute((warn_unused_result)).	marko	13 years ago
1819.5.246	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6830 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6830 Original Authors: marko Original commit message: branches/zip: buf_page_peek_if_too_old(): Use 32-bit arithmetics when comparing the age of access_time to buf_LRU_old_threshold_ms. This fixes a bug on 64-bit systems.	marko	13 years ago

Older »