mariadb

Tree: cb6e70a55c

Author	SHA1	Message	Date
unknown	cb6e70a55c	Fix a compilation failiure on QNX sql/udf_example.c: Declare tmp_error at the beginning of the block (this is C now)	20 years ago
unknown	53cc83fef2	.del-sp.test.orig: Delete: mysql-test/t/sp.test.orig BitKeeper/deleted/.del-sp.test.orig: Delete: mysql-test/t/sp.test.orig	20 years ago
unknown	75e40b161b	Applied innodb-5.0-ss677 snapshot. Fixes: - bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash - bug #21112: InnoDB slow with > 100,000 .ibd files - bug #21113: Duplicate printout in SHOW INNODB STATUS innobase/fil/fil0fil.c: Applied innodb-5.0-ss677 snapshot. Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug #21112. innobase/ibuf/ibuf0ibuf.c: Applied innodb-5.0-ss677 snapshot. ibuf_print(): Don't print redundant information. Fixes bug #21113. sql/ha_innodb.cc: Applied innodb-5.0-ss677 snapshot. ha_innobase::start_stmt(): patch from Heikki: Do not call read_view_close_for_mysql(). (Bug #19834)	20 years ago
unknown	edeea349b9	Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge	20 years ago
unknown	f3099ba3e0	Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge	20 years ago
unknown	03206fd717	Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge extra/yassl/src/ssl.cpp: Auto merged	20 years ago
unknown	76f65b3fb3	Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge	20 years ago
unknown	10888499ee	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 into mysql.com:/Users/kent/mysql/bk/mysql-5.0 configure.in: Auto merged	20 years ago
unknown	66716f0984	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged	20 years ago
unknown	189a687971	configure.in: Corrected typo configure.in: Corrected typo	20 years ago
unknown	1d0f873d56	Fix after manual merge. tests/mysql_client_test.c: Fix after manual merge: add test for bug#21206.	20 years ago
unknown	74214b8635	Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge configure.in: Auto merged man/Makefile.am: Auto merged mysys/my_bitmap.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged sql/sql_locale.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/t/mysqlbinlog.test: Manual merge. sql/sql_select.cc: Manual merge.	20 years ago
unknown	3c9ba0208a	udf_example.c, udf.test, Makefile.am: Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336) sql/Makefile.am: "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336) mysql-test/t/udf.test: "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336) sql/udf_example.c: Changes to be strict ansi, except long long	20 years ago
unknown	04d60b3897	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: SCCS merged	20 years ago
unknown	d1fde0f7f5	Makefile.am, configure.in: Man page for mysqld command move to section 8 (bug#21220) configure.in: Man page for mysqld command move to section 8 (bug#21220) man/Makefile.am: Man page for mysqld command move to section 8 (bug#21220)	20 years ago
unknown	6f65bffebd	make_binary_distribution.sh: Man page for "mysqld" command move to section 8 (bug#21220) scripts/make_binary_distribution.sh: Man page for "mysqld" command move to section 8 (bug#21220)	20 years ago
unknown	a811cc0a88	mysql.spec.sh: Man page for "mysqld" command move to section 8 (bug#21220) support-files/mysql.spec.sh: Man page for "mysqld" command move to section 8 (bug#21220)	20 years ago
unknown	8c4ba9687f	Merge mysql.com:/Users/kent/mysql/bk/tmp_merge into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new netware/BUILD/mwasmnlm: Auto merged netware/BUILD/mwccnlm: Auto merged netware/BUILD/mwldnlm: Auto merged	20 years ago
unknown	77831e7578	Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new sql/sql_select.cc: Auto merged	20 years ago
unknown	8d73c0b392	sql_select.cc: Renamed variable, to avoid name clash with macro "rem_size" on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648) asn.cpp, asn.hpp: Avoid name clash with NAME_MAX sql/sql_select.cc: Renamed variable, to avoid name clash with macro "rem_size" on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648) extra/yassl/taocrypt/src/asn.cpp: Avoid name clash with NAME_MAX extra/yassl/taocrypt/include/asn.hpp: Avoid name clash with NAME_MAX	20 years ago
unknown	1986093055	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 into maint1.mysql.com:/data/localhome/tsmith/bk/global-50	20 years ago
unknown	78e24656ed	Removing temporary changes.	20 years ago
unknown	798ffbd8ee	Temporary changes just to check some points (will be restored).	20 years ago
unknown	c4cfa9ab17	Revert the change after null-merge. mysys/my_bitmap.c: Revert the change forced during null-merge.	20 years ago
unknown	350cc4615d	Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main sql/sql_select.cc: Null-merge tests/mysql_client_test.c: Null-merge	20 years ago
unknown	7dbd43b1a4	BUG#21206: memory corruption when too many cursors are opened at once Too many cursors (more than 1024) could lead to memory corruption. This affects both, stored routines and C API cursors, and the threshold is per-server, not per-connection. Similarly, the corruption could happen when the server was under heavy load (executing more than 1024 simultaneous complex queries), and this is the reason why this bug is fixed in 4.1, which doesn't support cursors. The corruption was caused by a bug in the temporary tables code, when an attempt to create a table could lead to a write beyond allocated space. Note, that only internal tables were affected (the tables created internally by the server to resolve the query), not tables created with CREATE TEMPORARY TABLE. Another pre-condition for the bug is TRUE value of --temp-pool startup option, which, however, is a default. The cause of a bug was that random memory was overwritten in bitmap_set_next() due to out-of-bound memory access. mysys/my_bitmap.c: Local 'bitmap_size' is measured in bytes, no need to multiply it by 8. sql/sql_select.cc: Clear the temp_pool_slot bit only if we have set it previously. tests/mysql_client_test.c: Add test case for bug#21206: memory corruption when too many cursors are opened at once.	20 years ago
unknown	a6557b0c94	Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main VC++Files/sql/mysqld.vcproj: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/warnings-master.opt: Auto merged mysql-test/t/warnings.test: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged	20 years ago
unknown	b60272915f	Merge siva.hindu.god:/usr/home/tim/m/bk/global-41 into siva.hindu.god:/usr/home/tim/m/bk/global-50 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/field.cc: Auto merged	20 years ago
unknown	35945019ea	BUG#21206: memory corruption when too many cursors are opened at once Too many cursors (more than 1024) could lead to memory corruption. This affects both, stored routines and C API cursors, and the threshold is per-server, not per-connection. Similarly, the corruption could happen when the server was under heavy load (executing more than 1024 simultaneous complex queries), and this is the reason why this bug is fixed in 4.1, which doesn't support cursors. The corruption was caused by a bug in the temporary tables code, when an attempt to create a table could lead to a write beyond allocated space. Note, that only internal tables were affected (the tables created internally by the server to resolve the query), not tables created with CREATE TEMPORARY TABLE. Another pre-condition for the bug is TRUE value of --temp-pool startup option, which, however, is a default. The cause of a bug was that random memory was overwritten in bitmap_set_next() due to out-of-bound memory access. mysys/my_bitmap.c: Local 'bitmap_size' is measured in bytes, no need to multiply it by 8. sql/sql_select.cc: Clear the temp_pool_slot bit only if we have set it previously.	20 years ago
unknown	820840a026	Applied innodb-5.0-ss660 snapshot. innobase/btr/btr0cur.c: Applied innodb-5.0-ss660 snapshot. btr_cur_search_to_nth_level(): Reacquire btr_search_latch after inserting to the insert buffer. This was noticed while analyzing Bug#19081 but this shold not fix this bug since according to Heikki, btr_search_latch is not reserved during an insert. innobase/ibuf/ibuf0ibuf.c: Applied innodb-5.0-ss660 snapshot. ibuf_fixed_addr_page(): Add parameter space. As the insert buffer B-tree is only located in the system tablespace (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0. innobase/include/sync0rw.ic: Applied innodb-5.0-ss660 snapshot. rw_lock_s_unlock_func(): Change a debug assertion to a production assertion in order to track down Bug#19081.	20 years ago
unknown	d8bb59fc2f	Merge mysql.com:/home/alexi/innodb/mysql-4.1-work into mysql.com:/home/alexi/innodb/mysql-5.0-work Null merge. innobase/ibuf/ibuf0ibuf.c: Null merge.	20 years ago
unknown	03637f493e	Applied innodb-4.1-ss32 snapshot. innobase/ibuf/ibuf0ibuf.c: Applied innodb-4.1-ss32 snapshot. ibuf_fixed_addr_page(): Add parameter space. As the insert buffer B-tree is only located in the system tablespace (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0.	20 years ago
unknown	b0b0c8cc1f	"mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests. (Re-apply a patch from the general tree to the clone.) mysql-test/mysql-test-run.pl: "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests. (Re-apply a patch from the general tree to the clone.)	20 years ago
unknown	cd64ea0eab	slave.cc: BUG#20850: Assert during slave shutdown in many rpl_* tests This patch has already been applied to 5.1. sql/slave.cc: BUG#20850: Assert during slave shutdown in many rpl_* tests This patch has already been applied to 5.1.	20 years ago
unknown	39486004bb	Merge mysql.com:/home/hf/work/mysql-4.1.mrg into mysql.com:/home/hf/work/mysql-5.0.mrg libmysqld/lib_sql.cc: Auto merged tests/mysql_client_test.c: merging	20 years ago
unknown	c939a8d7e5	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 into trift2.:/M41/push-4.1	20 years ago
unknown	75220954bf	Merge trift2.:/M41/clone-4.1 into trift2.:/M41/push-4.1 sql/field.cc: Auto merged sql/sql_locale.cc: Changes were already present (and even better) == Null-merge == "ul".	20 years ago
unknown	def55c5219	Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows - Send confusing output to /dev/null mysql-test/t/mysqlbinlog.test: Send confusing error messages to /dev/null so they don't appear in erro log if test case fails	20 years ago
unknown	d6d5983074	Merge trift2.:/M41/clone-4.1 into trift2.:/M50/merge-4.1-to-5.0 VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/libmysqld/libmysqld.vcproj: Auto merged VC++Files/libmysqld/libmysqld_ia64.dsp: Auto merged VC++Files/mysqldemb/mysqldemb.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged VC++Files/sql/mysqld.vcproj: Auto merged VC++Files/sql/mysqld_ia64.dsp: Auto merged VC++Files/sql/mysqldmax.dsp: Auto merged sql/field.cc: Merge a backport == Null-merge == "ul". sql/field.h: Merge a backport == Null-merge == "ul". sql/sql_locale.cc: Changes were already present (and even better) == Null-merge == "ul".	20 years ago
unknown	4e31c3fe60	Merge trift2.:/M41/push-1-4.1 into trift2.:/M50/merge-4.1-to-5.0 strings/strtod.c: Manual merge: Null merge with header file cleanup ("my_base.h" includes "my_global.h", so we do not need both).	20 years ago
unknown	c98ff21c3a	Merge trift2.:/M41/tmp_merge into trift2.:/M50/merge-4.1-to-5.0 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_locale.cc: Auto merged sql/item_timefunc.cc: Merging by "ul", as asked in the original changeset. support-files/mysql.spec.sh: Manual merge, keeping alphabetic order.	20 years ago
unknown	af3f6282a5	Merge trift2.:/M41/tmp_merge into trift2.:/M50/merge-4.1-to-5.0 support-files/mysql.spec.sh: Auto merged configure.in: Manual - "use local".	20 years ago
unknown	394fe01f7f	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new	20 years ago
unknown	ea123dacfd	mwasmnlm, mwccnlm, mwldnlm: Filter out strange control characters, messes up logs netware/BUILD/mwasmnlm: Filter out strange control characters, messes up logs netware/BUILD/mwccnlm: Filter out strange control characters, messes up logs netware/BUILD/mwldnlm: Filter out strange control characters, messes up logs	20 years ago
unknown	9d5b76eba9	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.com:/usr/home/ram/work/4.1.b16327 sql/field.cc: Auto merged mysql-test/r/func_time.result: merging mysql-test/t/func_time.test: merging	20 years ago
unknown	b15e62733d	mysqlmanager.vcproj: Place mysqlmanager 'pdb' file in 'client_debug' directory mysys.vcproj: Removed define of __NT__ from 'Debug' target mysqld.vcproj: Always generate 'pdb' and 'map' files server-tools/instance-manager/mysqlmanager.vcproj: Place mysqlmanager 'pdb' file in 'client_debug' directory VC++Files/mysys/mysys.vcproj: Removed define of __NT__ from 'Debug' target VC++Files/sql/mysqld.vcproj: Always generate 'pdb' and 'map' files	20 years ago
unknown	a7ba5b75a6	Merge bk://anubis/mysql-5.0-engines into xiphis.org:/home/antony/work2/merge/mysql-5.0 sql/handler.cc: Auto merged	20 years ago
unknown	1376b5817f	Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)	20 years ago
unknown	93eef69dd5	Finish the merge of the patch for bug #15195 from 4.1 -> 5.0 - Adapt it to work with the handlerton class sql/handler.cc: Only create new MERGE handler if merge engine is enabled sql/mysql_priv.h: Use the myisammrg_hton.state field for the have_merge_db option sql/mysqld.cc: Handle the OPT_MERGE (--skip-merge) option case	20 years ago
unknown	c988ef942f	Merge bk@192.168.21.1:mysql-4.1 into mysql.com:/home/hf/work/mysql-4.1.19983 libmysqld/lib_sql.cc: Auto merged tests/mysql_client_test.c: Auto merged	20 years ago

1 2 3 4 5 ...

31399 Commits (cb6e70a55c985824981ebc2987b6f71c9219ec59) All Branches Search

31399 Commits (cb6e70a55c985824981ebc2987b6f71c9219ec59)

All Branches