mariadb

Tree: 315d7b3419

Author	SHA1	Message	Date
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
unknown	45ac6b3db6	Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl into riska.(none):/home/sven/bkroot/5.1-new-rpl	18 years ago
unknown	c9cbd6a48d	Fixed errors in pushbuild by updating test and result files. mysql-test/suite/binlog/r/binlog_row_binlog.result: updated result file. This part of the test was created in parallel with the fix to bug#26395, which modifies the output of mysqlbinlog and hence the output of many tests, including this one. mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result: updated result file mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test: 1. replaced include/show_slave_status.inc by more specific tests for the SQL error and IO error, as well as Slave_IO_State. 2. drop all tables at the end of test.	18 years ago
unknown	8e2d28e013	WL#4077 fix for innodb test that were skipped mysql-test/include/have_innodb.inc: added new value 'ENABLED' for 'support' field	18 years ago
unknown	6dd1f417d3	BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump client/mysql.cc: BUG#33057, avoid calling strlen() for every single character in the client's input	18 years ago
unknown	e5f1ceb467	Bug #29836 enable-pstack option appears even if --with-pstack is disabled Placed all pstack code inside of #ifdef's, so the options aren't displayed when not available.	18 years ago
unknown	77538eeb46	Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch into zim.(none):/home/bk/mysql-5.1-arch client/client_priv.h: Auto merged client/mysqlslap.c: Auto merged mysql-test/r/mysqlslap.result: Auto merged	18 years ago
unknown	9603ebc45c	client_priv.h: Removed dead option mysqlslap.c: Updates from Paul for help. Removed dead option client/mysqlslap.c: Updates from Paul for help. Removed dead option client/client_priv.h: Removed dead option	18 years ago
unknown	0fbc29c197	A pre-requisite for the fix for Bug#12713 "Error in a stored function called from a SELECT doesn't cause ROLLBACK of state" Make private all class handler methods (PSEA API) that may modify data. Introduce and deploy public ha_* wrappers for these methods in all sql/. This necessary to keep track of all data modifications in sql/, which is in turn necessary to be able to optimize two-phase commit of those transactions that do not modify data. sql/ha_partition.cc: Class ha_partition is no longer a friend of class handler. Use the public handler interface (handler::ha_ methods) for partition operations. Remove unnecessary casts from char[] to const char .ppзи выафвыаafa sql/handler.cc: Function ha_create_table() is no longer a friend of class handler. Use public handler::change_table_ptr() to access private members. This fixes a subtle bug (no test case in the test suite) when a deletion error occurs inside one partition of a partitioned engine. The old code would crash in handler::print_error() in this case. Implement the newly introduced public ha_ wrappers of the private virtual handler methods. sql/handler.h: Introduce ha_* wrappers to all class handler methods that may modify data. This is necessary to be able to keep track of data modifying operations of class handler and optimize read-only transactions. sql/item_sum.cc: delete_all_rows -> ha_delete_all_rows sql/sql_base.cc: Use the new public wrappers. sql/sql_delete.cc: delete_all_rows -> ha_delete_all_rows sql/sql_partition.cc: Use the new public wrappers. sql/sql_select.cc: delete_all_rows -> ha_delete_all_rows delete_table -> ha_delete_table disabe_indexes -> ha_disable_idnexes sql/sql_show.cc: delete_all_rows -> ha_delete_all_rows sql/sql_table.cc: Use the public wrappers for class handler DDL methods. All methods which may change handler data are now accessed via a public wrapper. sql/sql_union.cc: delete_all_rows -> ha_delete_all_rows {enable,disable}_indexes -> ha_{enable,disable}_indexes sql/sql_update.cc: bulk_update_row -> ha_bulk_update_row sql/unireg.cc: create_handler_files -> ha_create_handler_files	18 years ago
unknown	150590a0bc	BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER): Complementary patch since LOAD DATA INFILE was not covered in the previous patch. This patch adds a check so that the slave skip counter is not decreased to zero if seeing a BEGIN_LOAD_QUERY_EVENT, APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT since these cannot end a group. The group is terminated by an EXECUTE_LOAD_QUERY_ EVENT or DELETE_FILE_EVENT. mysql-test/r/rpl_slave_skip.result: Result change. mysql-test/t/rpl_slave_skip.test: Adding tests to test that the first event of a LOAD DATA INFILE can be skipped safely for both transactional and non-transactional tables. Also include a case that will generate a DELETE_FILE event last in the group, and this should be properly skipped as well. sql/slave.cc: Not decrementing slave skip counter to zero when seeing a BEGIN_LOAD_QUERY_EVENT, APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT since these cannot end a group.	18 years ago
unknown	fbb25b7cec	Merge linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848-gca into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848-gca mysql-test/r/union.result: Auto merged mysql-test/t/union.test: Auto merged sql/field.h: Auto merged sql/sql_select.cc: Auto merged sql/field.cc: Bug#32848: Manual merge sql/item.cc: Bug#32848: Manual merge	18 years ago
unknown	90dec398a5	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/misc/mysql/31990/50-31990	18 years ago
unknown	3fa2803a77	Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.hasky storage/maria/ma_key_recover.c: Auto merged	18 years ago
unknown	efd91dff2c	Fixes to merge. mysql-test/r/maria.result: Fixed result file. The results will be fixed by Sergei's patch. mysql-test/t/variables.test: Fixed result file. The results will be fixed by Sergei's patch. mysys/my_getopt.c: Fixed a problem with manual merge. sql/set_var.cc: Fixed a problem with manual merge. sql/set_var.h: Fixed a problem with manual merge. sql/sql_plugin.cc: Removed unneccessary function call. This was forgotten from a previous patch.	18 years ago
unknown	3e2531b9b0	Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt into linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848 sql/sql_select.cc: Auto merged	18 years ago
unknown	bf9c8b8a10	Write failure callback added. storage/maria/ma_key_recover.c: Initialization fixed (by Monty)	18 years ago
unknown	a8d1b13f3e	Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38 Warnings elimination sql/sql_select.cc: Bug#32848: Warnings elimination	18 years ago
unknown	8ba2819f96	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/misc/mysql/31990/50-31990 mysql-test/r/cast.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/t/cast.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged mysql-test/t/type_date.test: manual merge	18 years ago
unknown	3a13408f85	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into mysql.com:/misc/mysql/31990/51-31990 mysql-test/r/type_date.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/type_date.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_timefunc.cc: Auto merged	18 years ago
unknown	473d424782	Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE post-merge fixes mysql-test/r/type_date.result: post-merge fixes: test results	18 years ago
unknown	0aec8b21cf	Merge mysql.com:/misc/mysql/31990/50-31990 into mysql.com:/misc/mysql/31990/51-31990 mysql-test/r/cast.result: Auto merged mysql-test/t/cast.test: Auto merged sql/field.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged mysql-test/r/type_date.result: manual merge mysql-test/t/type_date.test: manual merge sql/field.cc: manual merge	18 years ago
unknown	5473858b64	Merge mysql.com:/Users/davi/mysql/bugs/28317-5.1 into mysql.com:/Users/davi/mysql/mysql-5.1-runtime sql/sql_yacc.yy: Auto merged	18 years ago
unknown	660e91b19b	Bug#28317 Left Outer Join with {oj outer-join} Parser rejects ODBC's escape sequences for outer joins other than left outer join, yet the escape sequence BNF specifies that this syntax can be used for left, right, and full outer join syntax. The problem is that although the MySQL Connector/ODBC advertises "Outer Join Escape Sequence" capabilities, the parsing is done in the server and historically it only supported this syntax for left outer joins and applications such as Crystal Reports 11 tries to use this syntax for inner joins. The chosen solution is to reorganize a couple of parser rules to ignore any kind of SQL escape sequence. Ignoring the escape sequences is harmless because the various SQL join clauses are supported by the server. mysql-test/r/parser.result: Add test case result for Bug#28317 mysql-test/t/parser.test: Add test case for Bug#28317 sql/sql_yacc.yy: Reorganize rules in order to ignore SQL Escape Sequences	18 years ago
unknown	9bf488563d	Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 into janus.mylan:/usr/home/serg/Abk/mysql-5.1 mysql-test/mysql-test-run.pl: 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	18 years ago
unknown	172a33beac	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into janus.mylan:/usr/home/serg/Abk/mysql-5.0	18 years ago
unknown	82aee4efdb	Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 into janus.mylan:/usr/home/serg/Abk/mysql-5.1 mysql-test/r/variables.result: Auto merged sql/set_var.cc: Auto merged mysql-test/t/variables.test: merged	18 years ago
unknown	154933ec02	correct invalid values in SET GLOBAL var=DEFAULT bug#33382 mysql-test/r/variables.result: typo in a test case mysql-test/t/variables.test: typo in a test case sql/set_var.cc: correct invalid values in SET GLOBAL var=DEFAULT	18 years ago
unknown	62e111e602	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into bodhi.(none):/opt/local/work/mysql-5.1-runtime sql/sql_table.cc: Auto merged	18 years ago
unknown	226700ee51	Make handler::{write,delete,update}_row private. It's critical that the entire server uses their public ha_* counterparts instead, since only then we can ensure proper tracing of these calls that is necessary for Bug#12713. A pre-requisite for Bug#12713 "Error in a stored function called from a SELECT doesn't cause ROLLBACK of statem" sql/ha_partition.cc: Use ha_write_row, ha_update_row, ha_delete_row instead of now-private write_row, update_row, delete_row. In future ha_* calls will contain more than just a call to the binary log, so it's essential they are used consistently everywhere in the server. Disable the undesired effect of double binary logging of changes to partitioned tables with tmp_disable_binlog. sql/handler.h: Make write_row, update_row, delete_row private. It's critical that the entire code base uses ha_write_row, ha_update_row, ha_delete_row instead -- in future, ha_* counterparts will have more common functionality than just a call to the binary log. sql/sql_select.cc: Use ha_write_row, ha_update_row, ha_delete_row instead of write_row, update_row, delete_row respectively. The change affects the join execution code that works with an intermediate internal temporary table. Do not disable binary logging, since it's unnecessary - temporary tables are not replicated by row level replication. sql/sql_table.cc: Use ha_write_row in copy_data_between_tables - the function that writes data from the original table to a temporary copy when executing ALTER TABLE. Do not disable binary logging since temporary tables are not replicated by row level replication anyway.	18 years ago
unknown	a2409d6088	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge sql/sql_string.cc: Auto merged	18 years ago
unknown	047ec78f2c	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/include/have_multi_ndb.inc: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/suite/binlog/r/binlog_stm_blackhole.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result: Auto merged mysql-test/suite/rpl_ndb/t/disabled.def: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/log.cc: Auto merged sql/log_event_old.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/rpl_rli.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_binlog.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_string.cc: Auto merged mysql-test/Makefile.am: SCCS merged mysql-test/mysql-test-run.pl: Manual merge. mysql-test/suite/binlog/t/disabled.def: Manual merge. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Manual merge. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Manual merge. sql/log_event.cc: Manual merge. ,	18 years ago
unknown	5480cbd69e	Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt into linux-st28.site:/home/martin/mysql/src/bug32848/my50-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	f216615633	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge sql/sql_string.cc: Auto merged	18 years ago
unknown	25fa7692ad	SHOW_VAR arrays are null-terminated :-[]	18 years ago
unknown	267b00d682	Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/r/user_var-binlog.result: Auto merged mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_stm_charset.result: Auto merged sql/log_event.cc: Auto merged	18 years ago
unknown	e64fae8bde	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/r/user_var-binlog.result: Auto merged mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_stm_charset.result: Auto merged mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Manual merge, using remove version of test. mysql-test/suite/rpl/r/rpl_timezone.result: Manual merge. sql/log_event.cc: Manual merge	18 years ago
unknown	604b3982ce	Followup for bug#30252. Ensure that all SQLCOM_ constants have corresponding Com_ variables. mysql-test/r/status.result: Tests updated. sql/mysqld.cc: Followup for bug#30252. Rename few variables to match SQL syntax. Ensure that all SQLCOM_ constants have corresponding Com_ variables.	18 years ago
unknown	881b405d06	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into janus.mylan:/usr/home/serg/Abk/mysql-5.1	18 years ago

... 6 7 8 9 10 ...

53168 Commits (315d7b3419fda7c4987c8f2c51d500ed2259899c) All Branches Search

53168 Commits (315d7b3419fda7c4987c8f2c51d500ed2259899c)

All Branches