mariadb

Tree: 1bc4867d3b

Author	SHA1	Message	Date
unknown	44101143f7	Fixed test layout error. mysql-test/r/query_cache.result: Moved test which requires debug binaries to a new file. mysql-test/t/query_cache.test: Moved test which requires debug binaries to a new file. mysql-test/r/query_cache_debug.result: Moved test which requires debug binaries to a new file. mysql-test/t/query_cache_debug.test: Moved test which requires debug binaries to a new file.	18 years ago
unknown	b8c8ca6845	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B33256-5.0-opt sql/field.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged	18 years ago
unknown	7e555be488	Replace one overlooked return with DBUG_RETURN in function log_loaded_block	18 years ago
unknown	bbbb77770b	Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0 into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl	18 years ago
unknown	7c136ed959	Fixed some test case after push of BUG#32205 mysql-test/r/binlog_start_comment.result: Drop tables used in the test case when done mysql-test/r/blackhole.result: Mask out file_id in show binlog events output mysql-test/r/case.result: Drop table t2 too if it exists at the start of the test mysql-test/t/blackhole.test: Mask out file_id in show binlog events output mysql-test/t/case.test: Drop table t2 too if it exists at the start of the test	18 years ago
unknown	e011346d18	Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0 into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl	18 years ago
unknown	6acef447d1	Add missing include test file for rpl_server_id test mysql-test/include/show_binlog_events2.inc: New BitKeeper file ``mysql-test/include/show_binlog_events2.inc''	18 years ago
unknown	bd2a1ae07c	Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0 into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl	18 years ago
unknown	1a40f7125f	Merge ramayana.hindu.god:/home/tsmith/m/bk/51 into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 BitKeeper/triggers/post-commit: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/sp_head.cc: Auto merged sql/sql_table.cc: Auto merged	18 years ago
unknown	48c7c1268a	Merge ramayana.hindu.god:/home/tsmith/m/bk/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 mysql-test/mysql-test-run.pl: Auto merged	18 years ago
unknown	8a824b6733	Merge adventure.(none):/home/thek/Development/cpp/bug30887/my51-bug30887 into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime sql/sql_cache.cc: Auto merged	18 years ago
unknown	a3561354a2	Bug#30887 Server crashes on SET GLOBAL query_cache_size=0 Reseting the query cache by issuing a SET GLOBAL query_cache_size=0 caused the server to crash if a the server concurrently was saving a new result set to the query cache. The reason for this was that the invalidation wasn't waiting on the result writers to release the block level locks on the query cache. mysql-test/r/query_cache.result: Added test for verifying that 'SET query_cache_size= 0' while inserting new statements into the query cache won't cause the server to crash. mysql-test/t/query_cache.test: Added test for verifying that 'SET query_cache_size= 0' while inserting new statements into the query cache won't cause the server to crash. sql/sql_cache.cc: - Applying a block level lock iteration of all query-type blocks prevents writers and readers from crashing when the query cache is removed.	18 years ago
unknown	8b15e4f37a	Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl into riska.(none):/home/sven/bk/b26395-autocommit-xa/5.0-rpl	18 years ago
unknown	bbedca3dbd	Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl into riska.(none):/home/sven/bk/b26395-autocommit-xa/5.1-new-rpl	18 years ago
unknown	f1e1a498a7	WL#4077 added support old versions of mysqld binaries mysql-test/include/have_multi_ndb.inc: check that information_schema.engines table exists	18 years ago
unknown	d658b408af	WL#4077, added mask for SHOW DATABASES statement mysql-test/suite/rpl/r/rpl_create_database.result: updated result file mysql-test/suite/rpl/r/rpl_load_from_master.result: updated result file mysql-test/suite/rpl/t/rpl_create_database.test: added the mask 'mysql%' for SHOW DATABASES mysql-test/suite/rpl/t/rpl_load_from_master.test: added the mask 'mysql%' for SHOw DATABASES	18 years ago
unknown	bdad41bace	Fix for bug #33305 : Test case in 'skip_grants' file need dynamic loading to be compiled in The problem was that on a statically built server an attempt to create a UDF resulted in a different, but reasonable error ("Can't open shared library" instead of "UDFs are unavailable with the --skip-grant-tables option"), which caused a failure for the test case for bug #32020. Fixed by moving the test case for bug #32020 from skip_grants.test to a separate test to ensure that it is only run when the server is built with support for dynamically loaded libraries. mysql-test/r/skip_grants.result: Moved the test case for bug #32020 to a separate test. mysql-test/t/skip_grants.test: Moved the test case for bug #32020 to a separate test. mysql-test/r/udf_skip_grants.result: Moved the test case for bug #32020 to a separate test. mysql-test/t/udf_skip_grants-master.opt: Moved the test case for bug #32020 to a separate test. mysql-test/t/udf_skip_grants.test: Moved the test case for bug #32020 to a separate test.	18 years ago
unknown	0e862b756a	Remove test rpl_drop_view from main suite BitKeeper/deleted/.del-rpl_drop_view.test: Delete: mysql-test/t/rpl_drop_view.test BitKeeper/deleted/.del-rpl_drop_view.result: Delete: mysql-test/r/rpl_drop_view.result	18 years ago
unknown	bbbdec345c	Move test rpl_server_id to suite rpl mysql-test/suite/rpl/t/rpl_server_id.test: Rename: mysql-test/t/rpl_server_id.test -> mysql-test/suite/rpl/t/rpl_server_id.test mysql-test/suite/rpl/r/rpl_server_id.result: Rename: mysql-test/r/rpl_server_id.result -> mysql-test/suite/rpl/r/rpl_server_id.result	18 years ago
unknown	529a480d81	Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0 into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.1 sql/set_var.cc: Auto merged BitKeeper/deleted/.del-rpl_slave_skip.result: Auto merged BitKeeper/deleted/.del-rpl_slave_skip.test: Auto merged sql/slave.cc: Manual merged	18 years ago
unknown	8be249064a	Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0 into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/mysql-5.0-rpl	18 years ago
unknown	46bfdbcac0	bug#30435 changes due to non-determinism in value of read_buffer_size. mysql-test/r/rpl_loaddata_map.result: results changed mysql-test/t/rpl_loaddata_map.test: showing only the fact that the buffer size is larger than the packet size. mysql-test/std_data/bug30435_10k_items.txt: data for bug#30435 regression testing mysql-test/std_data/bug30435_5k.txt: data for bug#30435 regression testing	18 years ago
unknown	ff84f4047e	bug#30435 refining the test after it failed on pb. mysql-test/r/rpl_loaddata_map.result: results changed mysql-test/t/rpl_loaddata_map.test: refining the test	18 years ago
unknown	ce187c0dc4	Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug33435-load_data_read_buffer_size sql/sql_repl.cc: Auto merged	18 years ago
unknown	40d89c44ea	BUG#30435 loading large LOAD DATA INFILE breaks slave with read_buffer_size set on master BUG#33413 show binlog events fails if binlog has event size of close to max_allowed_packet The size of Append_block replication event was determined solely by read_buffer_size whereas the rest of replication code deals with max_allowed_packet. When the former parameter was set to larger than the latter there were two artifacts: the master could not read events from binlog; show master events did not show. Fixed with - fragmenting the used io-cached buffer into pieces each size of less than max_allowed_packet (bug#30435) - incrementing show-binlog-events handling thread's max_allowed_packet with the max estimated for the replication header size include/my_sys.h: accessor-macros added in order not to mess with the io cache's implementation details in code that merely exploits the io-cache. sql/sql_repl.cc: BUG#33413: incrementing thd->variables.max_allowed_packet with the max estimation for the replication header size (from bug#19402); refactoring log_loaded_block() to fragment the io_cache buffer in case read_buffer_size > max_allowed_packet. mysql-test/r/rpl_loaddata_map.result: New BitKeeper file ``mysql-test/r/rpl_loaddata_map.result'' mysql-test/t/rpl_loaddata_map-master.opt: specific options to trigger BUG#30435, BUG#33413 situations mysql-test/t/rpl_loaddata_map-slave.opt: max_allowed_packet to be compatible with the master's version. mysql-test/t/rpl_loaddata_map.test: regression tests for two bugs.	18 years ago
unknown	7bc3e859f3	Undo previous merge. BitKeeper/deleted/.del-rpl_transaction.result: Delete: mysql-test/r/rpl_transaction.result BitKeeper/deleted/.del-rpl_transaction-master.opt: Delete: mysql-test/t/rpl_transaction-master.opt BitKeeper/deleted/.del-rpl_transaction-slave.opt: Delete: mysql-test/t/rpl_transaction-slave.opt BitKeeper/deleted/.del-rpl_transaction.test: Delete: mysql-test/t/rpl_transaction.test	18 years ago
unknown	ee9213de28	Merge riska.(none):/home/sven/bk/b26395-autocommit-xa/5.0-rpl into riska.(none):/home/sven/bk/b26395-autocommit-xa/5.1-new-rpl Should really not be merged, will undo later sql/log_event.cc: Auto merged BitKeeper/deleted/.del-sp_trans_log.result: Auto merged mysql-test/r/multi_update.result: bad auto merge, will undo later mysql-test/r/variables-big.result: bad auto merge, will undo later mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: bad auto merge, will undo later sql/log.cc: bad auto merge, will undo later	18 years ago
unknown	b5d95f021f	BUG#26395: if crash during autocommit update to transactional table on master, slave fails Now, every transaction (including autocommit transactions) start with a BEGIN and end with a COMMIT/ROLLBACK in the binlog. Added a test case, and updated lots of test case result files. mysql-test/t/rpl_transaction-master.opt: BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-master.opt mysql-test/t/rpl_transaction-slave.opt: BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-slave.opt mysql-test/r/mix_innodb_myisam_binlog.result: Updated result file mysql-test/r/multi_update.result: Updated result file mysql-test/r/rpl_transaction.result: New result file for new test case. mysql-test/r/sp_trans_log.result: Updated result file mysql-test/r/variables-big.result: Updated result file mysql-test/t/rpl_transaction.test: New test case. sql/log.cc: - Always write BEGIN and COMMIT around statements, even in autocommit mode. - Added comments for binlog_commit and binlog_rollback. sql/log_event.cc: Added debug trigger to avoid writing xid events to the binlog.	18 years ago
unknown	baf5c2c132	Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848 sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/union.result: Bug#32848: Manual merge mysql-test/t/union.test: Bug#32848: Manual merge	18 years ago
unknown	0718fb666c	Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug31359-future_gpos	18 years ago
unknown	c8f6457f65	Merge trift2.:/MySQL/M50/merge-5.0 into trift2.:/MySQL/M51/push-5.1 netware/mysql_test_run.c: Auto merged sql/sp_head.cc: Auto merged	18 years ago
unknown	df4e7698e7	Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1	18 years ago
unknown	c7eb461d54	Merge trift2.:/MySQL/M50/clone-5.0 into trift2.:/MySQL/M50/merge-5.0	18 years ago
unknown	a82cb42121	fixed broken result file	18 years ago
unknown	cd7b1fd9eb	Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 into janus.mylan:/usr/home/serg/Abk/mysql-5.1 sql/set_var.cc: Auto merged	18 years ago
unknown	2ae4b047a3	Bug #33256 : CREATE ... SELECT creates obsolete table w/ Field_date instead of Field_newdate Field_date was still used in temp table creation. Fixed by using Field_newdate consistently throughout the server except when reading tables defined with older MySQL version. No test suite is possible because both Field_date and Field_newdate return the same values in all the metadata calls. mysql-test/r/type_decimal.result: Bug #33256: removed redundant warnings sql/field.h: Bug #33256: Add a constructor similar to Field_date::Field_date() sql/item.cc: Bug #33256: Use Field_newdate instead of Field_date for all temp tables and CREATE .. SELECT sql/item_sum.cc: Bug #33256: Use Field_newdate instead of Field_date for all temp tables and CREATE .. SELECT sql/item_timefunc.cc: Bug #33256: Use Field_newdate instead of Field_date for all temp tables and CREATE .. SELECT sql/item_timefunc.h: Bug #33256: Use Field_newdate instead of Field_date for all temp tables and CREATE .. SELECT	18 years ago
unknown	f2716fa071	cast corrected sql/set_var.cc: typo :(	18 years ago
unknown	f2953330d3	Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 into janus.mylan:/usr/home/serg/Abk/mysql-5.1 sql/set_var.cc: Auto merged	18 years ago
unknown	76159fdfcc	Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rpl into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0	18 years ago
unknown	0c16a60207	warning on windows	18 years ago
unknown	b54f492662	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build client/mysql.cc: Auto merged	18 years ago
unknown	076d25220d	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build	18 years ago
unknown	544781ad88	Bug #31359 change_master sets group_master_log_pos twice, ignores future_group_master_log_p There was a redundant assignement. However, that's the only artifact. Wrt to future_group_master_log_position, there is no issue. The counter is supposed to be set at Log_event::exec_event(). It's used only by Innodb for recovery purposes. sql/sql_repl.cc: removing a redundant line which arrived with the revision 1.102.1.7.	18 years ago
unknown	9d7c0dda31	Merge capulet.kindahl.net:/home/mats/devel/b12691-mysql-5.0-rpl into capulet.kindahl.net:/home/mats/devel/fix-mysql-5.0-rpl	18 years ago
unknown	e2937d7f43	BUG#28908 Replication: set global server_id is not setting the session server_id When set the server-id dynamically, the server_id member of current thread is not updated. Update the server_id member of current thread after updated the global variable value. sql/set_var.cc: Update server_id of current thread mysql-test/r/rpl_server_id.result: Add test for BUG#28908 mysql-test/t/rpl_server_id.test: Add test for BUG#28908	18 years ago
unknown	fd1b142126	merged	18 years ago
unknown	1390bdb8b8	variables.result, variables.test: test case fixed mysql-test/r/variables.result: test case fixed mysql-test/t/variables.test: test case fixed	18 years ago
unknown	1548cb679a	after merge fix in mysqld.cc: added missing status variables (assert works! :) sql/mysqld.cc: added missing status variables (assert works! :)	18 years ago
unknown	3e756a80d4	my_atomic-t.c: gcc bug workaround unittest/mysys/my_atomic-t.c: gcc bug workaround	18 years ago
unknown	295732b580	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint into janus.mylan:/usr/home/serg/Abk/mysql-5.1 configure.in: Auto merged libmysql/CMakeLists.txt: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/information_schema.test: Auto merged sql/Makefile.am: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_geofunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/key.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged storage/archive/ha_archive.cc: Auto merged storage/innobase/buf/buf0buf.c: Auto merged storage/innobase/buf/buf0flu.c: Auto merged storage/innobase/buf/buf0lru.c: Auto merged storage/innobase/include/buf0buf.h: Auto merged storage/innobase/include/buf0buf.ic: Auto merged storage/innobase/include/sync0arr.h: Auto merged storage/innobase/include/sync0rw.h: Auto merged storage/innobase/include/sync0rw.ic: Auto merged storage/innobase/include/sync0sync.h: Auto merged storage/innobase/os/os0sync.c: Auto merged storage/innobase/sync/sync0arr.c: Auto merged storage/innobase/sync/sync0rw.c: Auto merged storage/innobase/sync/sync0sync.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: merged sql/item_cmpfunc.cc: merged sql/protocol.cc: merged sql/slave.cc: merged sql/sql_class.h: merged sql/sql_parse.cc: merged	18 years ago

... 2 3 4 5 6 ...

52555 Commits (1bc4867d3b42f8288897e67424cc6ee54ec5d04f) All Branches Search

52555 Commits (1bc4867d3b42f8288897e67424cc6ee54ec5d04f)

All Branches