mariadb

Tree: 5698114c97

Author	SHA1	Message	Date
unknown	5698114c97	Merge bk-internal.mysql.com:/home/bk/mysql-4.1 into chilla.local:/home/mydev/mysql-4.1-axmrg mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged sql/mysqld.cc: Auto merged	19 years ago
unknown	2df2922586	Valgrind error fixes Notes: This patch doesn't fix all issues in the tree and we need jani's fix for that This patch shoud not be merged into 5.0 mysql-test/r/ps.result: result fix mysql-test/r/symlink.result: result fix mysql-test/t/ps.test: test is moved to 'symlink' test mysql-test/t/symlink.test: test from 'ps' test sql/field_conv.cc: valgrind error fix: backport from 5.0 sql/mysqld.cc: release of ssl_context vio/viosslfactories.c: release of ssl_context mysql-test/valgrind.supp: New BitKeeper file ``mysql-test/valgrind.supp'' This file is backported from 5.0, added suppressing of OpenSSL errors	19 years ago
unknown	62fdcb54a7	Merge chilla.local:/home/mydev/mysql-4.0-axmrg into chilla.local:/home/mydev/mysql-4.1-axmrg include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/thr_alarm.h: Auto merged mysys/default.c: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/my_thr_init.c: Manual merged sql/mysqld.cc: Manual merged	19 years ago
unknown	a94b1b5077	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines into chilla.local:/home/mydev/mysql-4.1-axmrg	19 years ago
unknown	ab3abe1232	Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines	19 years ago
unknown	f7b3c7c531	WL#3567 - MERGE engine: a check for underlying table conformance When a merge table is opened compare column and key definition of underlying tables against column and key definition of merge table. If any of underlying tables have different column/key definition refuse to open merge table. mysql-test/r/merge.result: A test case for WL#3456. mysql-test/t/merge.test: A test case for WL#3456. sql/ha_myisam.cc: Moved a part of code that converts TABLE object to MyISAM key and column definition to a separate function. Added check_definition() function that compares MyISAM table definitions. sql/ha_myisammrg.cc: Check if underlying table definition conforms to merge table definition, and in case underlying table definition differs, refuse to open merge table.	19 years ago
unknown	7be3cad45d	Merge bk://localhost:5559 into production.mysql.com:/usersnfs/jamppa/mysql-4.0 include/my_global.h: Auto merged include/my_pthread.h: Auto merged mysys/default.c: Auto merged mysys/my_pthread.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/thr_alarm.c: Auto merged sql/mysqld.cc: Auto merged	19 years ago
unknown	cdf6001aeb	Cleanup of thread-type (linuxthread or NTPL) detection code Move get_thread_lib to mysys/my_pthread.c Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms include/my_global.h: Fixed to be same as in 5.1 include/my_pthread.h: Move things around to be more in line with rest of code mysys/default.c: Fixed two wrong pointer incrementations. mysys/my_pthread.c: Cleanup: Use variable thr_client_alarm mysys/my_thr_init.c: Detect thread library at startup. Set also thr_client_alarm signal here, so that we get it in init_signals() in mysqld mysys/thr_alarm.c: Set thr_client_alarm depending on which thread library we are using sql/mysqld.cc: Move get_thread_lib to mysys/my_pthread.c	19 years ago
unknown	d308799383	Merge bk-internal.mysql.com:/home/bk/mysql-4.1 into chilla.local:/home/mydev/mysql-4.1-axmrg mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged mysql-test/r/myisam.result: Manual merged mysql-test/t/myisam.test: Manual merged	19 years ago
unknown	fddf3c3979	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/4.1 sql/item_func.cc: Auto merged	19 years ago
unknown	2ec2fa6d08	Cleanup of thread-type (linuxthread or NTPL) detection code Move get_thread_lib to mysys/my_pthread.c Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms include/my_global.h: Fixed to be same as in 5.1 include/my_pthread.h: Move things around to be more in line with rest of code include/thr_alarm.h: extern of thr_client_alarm mysys/default.c: Fixed two wrong pointer incrementations. mysys/my_pthread.c: Cleanup: Use variable thr_client_alarm mysys/my_thr_init.c: Detect thread library at startup mysys/thr_alarm.c: Set thr_client_alarm depending on which thread library we are using sql/mysqld.cc: Move get_thread_lib to mysys/my_pthread.c	19 years ago
unknown	9403c7ca67	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines into chilla.local:/home/mydev/mysql-4.1-bug24607	19 years ago
unknown	112ef50f28	Bug#24607 - MyISAM pointer size determined incorrectly Fixed test. On 32-bit machines which compile without -DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value. Using a value below 4G is portable. mysql-test/r/myisam.result: Bug#24607 - MyISAM pointer size determined incorrectly Fixed test results.	19 years ago
unknown	0c302993e6	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build	19 years ago
unknown	16e600c02e	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work	19 years ago
unknown	7513ef2651	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines	19 years ago
unknown	457d431556	Bug#25668 mysqld may core if cluster disconnected - recommit in 4.1	19 years ago
unknown	1f4d8ba085	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines into chilla.local:/home/mydev/mysql-4.1-bug24607 mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged	19 years ago
unknown	4eec436001	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build into trift2.:/MySQL/M41/push-4.1	19 years ago
unknown	6d04643ab3	Fixed bug #25637 : LEFT JOIN with BOOLEAN FULLTEXT loses left table matches. The bug is actually a duplicate of the bug 14708. Down-ported the fix for 14708 from 5.0. Merged the test case for bug 14708 from 5.0. mysql-test/r/fulltext_left_join.result: Added a test case for bug #25637 (duplicate .of bug 14708). Merged the test case for bug 14708 from 5.0. mysql-test/t/fulltext_left_join.test: Added a test case for bug #25637 (duplicate of bug 14708). Merged the test case for bug 14708 from 5.0. sql/item_func.cc: Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches. The bug is actually a duplicate of the bug 14708. Down-ported the fix for 14708 from 5.0.	19 years ago
unknown	4dcb54a8ec	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build mysql-test/mysql-test-run.pl: Auto merged	19 years ago
unknown	45b9381f07	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work scripts/mysqld_multi.sh: Auto merged	19 years ago
unknown	4f69569dfa	after-merge fix	19 years ago
unknown	747ec6f904	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work BUILD/check-cpu: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/myisam.test: Auto merged	19 years ago
unknown	fde52a2f82	BUG#24401 - MySQL server crashes if you try to retrieve data from corrupted table Accessing a table with corrupted column definition results in server crash. This is fixed by refusing to open such tables. Affects MyISAM only. No test case, since it requires crashed table. myisam/mi_open.c: Refuse to open MyISAM table with summary columns length bigger than length of the record.	19 years ago
unknown	db3534e2fb	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build mysql-test/mysql-test-run.pl: Auto merged	19 years ago
unknown	077840fa23	Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 include/thr_alarm.h: Auto merged mysys/my_pthread.c: Auto merged BUILD/SETUP.sh: Merged from 4.0 configure.in: Merged from 4.0 include/my_global.h: Merged from 4.0 include/my_pthread.h: Merged from 4.0 mysys/thr_alarm.c: Merged from 4.0 sql/mysqld.cc: Merged from 4.0 BUILD/SETUP.sh.rej: Merged from 4.0 configure.in.rej: Merged from 4.0 include/my_global.h.rej: Merged from 4.0 include/my_pthread.h.rej: Merged from 4.0 mysys/thr_alarm.c.rej: Merged from 4.0 sql/mysqld.cc.rej: Merged from 4.0	19 years ago
unknown	454c763c6b	Fix for configure to detect library correctly. Fix to check library in use during runtime. Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used". BUILD/SETUP.sh: To avoid warnings during compilation. configure.in: Fixed configure so that it can correctly detect between NPTL and Linuxthreads. include/my_global.h: Fix for Linuxthreads. include/my_pthread.h: Added defines for different libraries that can be detected. Currently only 'other', 'nptl', and 'lt' (linuxthreads) are being used. changed sigset() and signal() to my_sigset() and my_signal() include/thr_alarm.h: Removed defines for Linuxthreads. This is now detected during runtime and handled in the thr_alarm.c mysys/my_pthread.c: Runtime check for library. mysys/thr_alarm.c: Runtime checks for library and corresponding signals. sql/mysqld.cc: Added function for detecting thread library in use during start-up. THR_KILL_SIGNAL removed, setting signals during runtime.	19 years ago
unknown	4fda992bff	ndb_types.test: sleep a bit longer, to ensure that timestamp > @now mysql-test/r/ndb_types.result: update results mysql-test/t/ndb_types.test: Sleep a bit longer, to ensure that timestamp changes between: set @now = now(); and: insert into/update t1 Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again. This should(?) avoid that fluke. Clean up test file a bit while I'm here.	19 years ago
unknown	d1824f12f4	Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40 into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41	19 years ago
unknown	3d62df333b	Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 sql/sql_show.cc: Auto merged sql/sql_parse.cc: Manual merge	19 years ago
unknown	811bdbba11	Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40	19 years ago
unknown	ecb637b4e0	Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 configure.in: Use local	19 years ago
unknown	543f4a073c	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41	19 years ago
unknown	7b2b2231a2	Raise version number after cloning 4.0.29	19 years ago
unknown	3ae893c42c	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build	19 years ago
unknown	26010833ea	Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41	19 years ago
unknown	7d274c052e	Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 configure.in: Use local	19 years ago
unknown	bbacca834d	Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 innobase/buf/buf0buf.c: Use local innobase/buf/buf0flu.c: Use local innobase/buf/buf0lru.c: Use local innobase/include/buf0buf.h: Use local innobase/include/buf0buf.ic: Use local innobase/include/sync0arr.h: Use local innobase/include/sync0rw.h: Use local innobase/include/sync0rw.ic: Use local innobase/include/sync0sync.h: Use local innobase/os/os0sync.c: Use local innobase/sync/sync0arr.c: Use local innobase/sync/sync0rw.c: Use local innobase/sync/sync0sync.c: Use local	19 years ago
unknown	3125781a8d	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint BUILD/check-cpu: Auto merged	19 years ago
unknown	158b0603f3	Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged	19 years ago
unknown	63cb7acee2	Bug#23721: compile fails: check-cpu mishandles cpu flags with \ hyphen in it (like ds-cpl). convert illegal chars in cpu flags to '_' for variable assignment BUILD/check-cpu: convert illegal chars in cpu flags to '_' for variable assignment	19 years ago
unknown	2456c61d39	Merge chilla.local:/home/mydev/mysql-4.1--team into chilla.local:/home/mydev/mysql-4.1-bug24607	19 years ago
unknown	f7e41baedb	Fix a failure of lowercase_tables2 test on powermacg5, introduced by the patch for Bug#4968 sql/sql_parse.cc: Fix lowercase_tables2 test failure on powermacg5: table_case_name() function needed create_info.alias if lowercase_table_names=2, which was not set for the stack copy of HA_CREATE_INFO. Move the update of create_info.alias from create_table_precheck to mysql_execute_command, so that it is done on the right object.	19 years ago
unknown	f509e774bc	Bug#21122 SHOW CREATE TABLE: directory output only sometimes Bug #25000 myisam.test fails on 'pb-valgrind-*' Valgrind - Move tests that need symlink to symlink.test mysql-test/r/myisam.result: - Move tests that need symlink to symlink.test mysql-test/r/symlink.result: - Move tests that need symlink to symlink.test mysql-test/t/myisam.test: - Move tests that need symlink to symlink.test mysql-test/t/symlink.test: - Move tests that need symlink to symlink.test	19 years ago
unknown	eb179ebefc	Cset exclude: msvensson@pilot.mysql.com\|ChangeSet\|20070117102733\|42618 mysql-test/r/myisam.result: Exclude mysql-test/t/myisam.test: Exclude	19 years ago
unknown	b95f107371	Bug#25505 Myisam library compiler error on Windows myisam/mi_packrec.c: Combine the declaration of variable and assignment into one line since that is allowed befgore declaring another variable in C.	19 years ago
unknown	1ce535c6ab	Cset exclude: msvensson@neptunus.(none)\|ChangeSet\|20060825084614\|09755 mysql-test/r/myisam.result: Exclude mysql-test/t/myisam.test: Exclude	19 years ago
unknown	4743deeba0	Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1 into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint mysql-test/t/mysqladmin.test: Auto merged mysys/mf_iocache.c: Auto merged mysys/my_read.c: Auto merged mysys/my_seek.c: Auto merged sql/sql_parse.cc: Auto merged	19 years ago
unknown	03df5c1c5b	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build	19 years ago

1 2 3 4 5 ...

21739 Commits (5698114c979810308920e24225b4553aeb4a65da) All Branches Search

21739 Commits (5698114c979810308920e24225b4553aeb4a65da)

All Branches