mariadb

Tree: 2e12a17d17

Author	SHA1	Message	Date
unknown	2e12a17d17	Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam into mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl mysql-test/suite/binlog/r/binlog_base64_flag.result: Auto merged mysql-test/suite/binlog/t/binlog_base64_flag.test: Auto merged mysql-test/suite/rpl/r/rpl_row_create_table.result: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/sql_insert.cc: Auto merged	18 years ago
unknown	f56d77dadf	BUG#29020 (Event results not correctly replicated to slave in RBR): The bug allow multiple executing transactions working with non-transactional to interfere with each others by interleaving the events of different trans- actions. Bug is fixed by writing non-transactional events to the transaction cache and flushing the cache to the binary log at statement commit. To mimic the behavior of normal statement-based replication, we flush the transaction cache in row- based mode when there is no committed statements in the transaction cache, which means we are committing the first one. This means that it will be written to the binary log as a "mini-transaction" with just the rows for the statement. Note that the changes here does not take effect when building the server with HAVE_TRANSACTIONS set to false, but it is not clear if this was possible before this patch either. For row-based logging, we also have that when AUTOCOMMIT=1, the code now always generates a BEGIN/COMMIT pair for single statements, or BEGIN/ROLLBACK pair in the case of non-transactional changes in a statement that was rolled back. Note that for the case where changes to a non-transactional table causes a rollback due to error, the statement will now be logged with a BEGIN/ROLLBACK pair, even though some changes has been committed to the non-transactional table. mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test: Removing SHOW BINLOG EVENTS causing test to be non-deterministic. mysql-test/r/ctype_cp932_binlog_row.result: Result change. mysql-test/suite/binlog/r/binlog_base64_flag.result: Result change. mysql-test/suite/binlog/r/binlog_multi_engine.result: Result file change. mysql-test/suite/binlog/r/binlog_row_binlog.result: Result file change. mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result: Result file change. mysql-test/suite/binlog/r/binlog_row_insert_select.result: Result file change. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Result file change. mysql-test/suite/binlog/r/binlog_stm_binlog.result: Result file change. mysql-test/suite/binlog/t/binlog_base64_flag.test: Removing table that will be used in test to prevent failing if preceeding tests forgot to drop the table. mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result: Result file change. mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result: Result file change. mysql-test/suite/rpl/r/rpl_row_create_table.result: Result file change. mysql-test/suite/rpl/r/rpl_row_delayed_ins.result: Result file change. mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result: Result file change. mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result: Result file change. mysql-test/suite/rpl/r/rpl_row_log.result: Result file change. mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Result file change. mysql-test/suite/rpl/r/rpl_row_until.result: Result file change. mysql-test/suite/rpl/r/rpl_slave_skip.result: Result file change. mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: Result file change. mysql-test/suite/rpl/r/rpl_truncate_2myisam.result: Result file change. mysql-test/suite/rpl/t/rpl_row_create_table.test: Binlog position change. mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test: Binlog position change. mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Binlog position change. Added stop position to mysqlbinlog argments to prevent extreneous output. mysql-test/suite/rpl/t/rpl_row_until.test: Binlog position change. mysql-test/suite/rpl/t/rpl_slave_skip.test: Binlog position change. mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Removing extreneous SHOW BINLOG EVENTS causing test to be non-deterministic. mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: Result change. sql/log.cc: Adding variable at_least_one_stmt to denote that there is at least one statement committed to the transaction cache (but there might be more). Removing duplicate checks from binlog_end_trans(). The transaction cache should always be committed or rolled back when this function is called. Correcting conditions for binlog_rollback() and binlog_commit() and removing the previous "invisible commit" in favor of always using explicit commits in the binary log. sql/log_event.cc: Marking table map event to be cached. Removing Muted_query_log_event from code. sql/log_event.h: Removing unused class Muted_query_log_event. sql/sql_insert.cc: Adding missing call to ha_autocommit_or_rollback() for delayed thread. Marking CREATE-SELECT statements as transactional, since they don't need to be logged.	18 years ago
unknown	9d0385d62b	Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam sql/sql_acl.cc: Auto merged	18 years ago
unknown	347972bc70	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1 into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam sql/sql_acl.cc: Auto merged sql/sql_select.cc: Auto merged	18 years ago
unknown	ab82016ae8	Merge bk-internal:/home/bk/mysql-5.0 into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam sql/sql_acl.cc: Auto merged	18 years ago
unknown	183ded7ab3	Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam	18 years ago
unknown	1c734848ab	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1 into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam mysql-test/r/grant.result: Auto merged mysql-test/t/grant.test: Auto merged sql/sql_acl.cc: Auto merged sql/sql_connect.cc: Auto merged	18 years ago
unknown	c1af64e04f	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam	18 years ago
unknown	b6b4202b48	Merge bk-internal:/home/bk/mysql-5.0 into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam	18 years ago
unknown	8e5c29fac4	Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam mysql-test/t/grant.test: Auto merged sql/sql_acl.cc: Auto merged mysql-test/r/grant.result: merge 5.0-bugteam to 5.1-bugteam	18 years ago
unknown	5cae19a892	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam into magare.gmz:/home/kgeorge/mysql/autopush/B35206-5.1-bugteam sql/sql_select.cc: Auto merged	18 years ago
unknown	0cf83bbf56	Merge mysql.com:/misc/mysql/mysql-5.0-opt into mysql.com:/misc/mysql/mysql-5.1-opt CMakeLists.txt: Auto merged configure.in: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged	18 years ago
unknown	ed1d366a23	Merge mysql.com:/misc/mysql/mysql-5.0 into mysql.com:/misc/mysql/mysql-5.0-opt CMakeLists.txt: Auto merged configure.in: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged	18 years ago
unknown	ea4c84eada	Merge mysql.com:/misc/mysql/mysql-5.1 into mysql.com:/misc/mysql/mysql-5.1-opt CMakeLists.txt: Auto merged configure.in: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_db.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged	18 years ago
unknown	77fbeeab24	Bug #35206 : select query result different if the key is indexed or not The code for executing indexed ORDER BY was not setting all the internal fields correctly when selecting to execute ORDER BY over and index. Fixed by change the access method to one that will use the quick indexed access if one is selected while selecting indexed ORDER BY. mysql-test/r/order_by.result: Bug #35206: test case mysql-test/t/order_by.test: Bug #35206: test case sql/sql_select.cc: Bug #35206: Change the access method when selecting a quick indexed access.	18 years ago
unknown	f6013e63b8	Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash reverting test that has been obsoleted by changes to the code mysql-test/r/key_cache.result: reverting test that has been obsoleted by changes to the code mysql-test/t/key_cache.test: reverting test that has been obsoleted by changes to the code	18 years ago
unknown	1561ee5c56	Merge host.loc:/home/uchum/work/5.0-opt into host.loc:/home/uchum/work/5.1-opt configure.in: Auto merged sql/item.cc: Auto merged	18 years ago
unknown	8e473edd48	Merge host.loc:/home/uchum/work/mysql-5.0 into host.loc:/home/uchum/work/5.0-opt configure.in: Auto merged sql/item.cc: Auto merged	18 years ago
unknown	f8653a79e9	Patch clean up. Fixed interference between tests: Users were added but not properly removed. This caused later tests to fail. mysql-test/r/grant.result: Fixed interference between tests: Users were added but not properly removed. This caused later tests to fail. mysql-test/t/grant.test: Fixed interference between tests: Users were added but not properly removed. This caused later tests to fail.	18 years ago
unknown	099c888967	Merge trift2.:/MySQL/M50/push-5.0 into trift2.:/MySQL/M51/push-5.1	18 years ago
unknown	0c2b63306a	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build into trift2.:/MySQL/M51/push-5.1	18 years ago
unknown	0db1f520c6	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build into trift2.:/MySQL/M50/push-5.0	18 years ago
unknown	a0cf1fa168	Merge trift2.:/MySQL/M51/ndb-decl-5.1 into trift2.:/MySQL/M51/push-5.1	18 years ago
unknown	861434c3b0	Merge mysql.com:/Users/davi/mysql/mysql-5.1-bug33201 into mysql.com:/Users/davi/mysql/mysql-5.0-bugteam sql/sql_acl.cc: Auto merged	18 years ago
unknown	abe22f2e84	Merge host.loc:/home/uchum/work/5.0-opt into host.loc:/home/uchum/work/5.1-opt sql/sql_delete.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_update.cc: Auto merged configure.in: SCCS merged	18 years ago
unknown	648dae6043	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 BitKeeper/deleted/.del-configure.js: Auto merged	18 years ago
unknown	5a6b357e6f	BUG#25340	18 years ago
unknown	1207c86644	Merge host.loc:/home/uchum/work/4.1-opt into host.loc:/home/uchum/work/5.0-opt configure.in: Merge with 4.1-opt.	18 years ago
unknown	a451de2f59	Merge host.loc:/home/uchum/work/mysql-5.1 into host.loc:/home/uchum/work/5.1-opt client/mysqltest.c: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/information_schema.test: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged	18 years ago
unknown	09d7b08a5c	Merge trift2.:/MySQL/M50/push-5.0 into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged	18 years ago
unknown	11cfd2ed67	Merge host.loc:/home/uchum/work/mysql-5.0 into host.loc:/home/uchum/work/5.0-opt sql/sql_delete.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_update.cc: Auto merged	18 years ago
unknown	797a2d68f8	Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged	18 years ago
unknown	9878e861a2	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged	18 years ago
unknown	db9df4c725	Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50 into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51	18 years ago
unknown	42a06b4614	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 into rhel5-ia64-a.mysql.com:/data0/tsmith/build/50	18 years ago
unknown	f676e12268	Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51 into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51	18 years ago
unknown	45ebe99533	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51 sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged mysql-test/r/drop.result: SCCS merged mysql-test/t/drop.test: SCCS merged	18 years ago
unknown	86f80526c1	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam into mysql.com:/misc/mysql/34731/51-34731	18 years ago
unknown	ed6b0a2f50	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam into mysql.com:/misc/mysql/34731/50-34731	18 years ago
unknown	548b389f3a	Merge mysql.com:/misc/mysql/34731/50-34731 into mysql.com:/misc/mysql/34731/51-34731 mysql-test/t/range.test: Auto merged sql/opt_range.cc: Auto merged mysql-test/r/range.result: manual merge	18 years ago
unknown	fd1616311d	Merge mysql.com:/misc/mysql/34731_/50-34731 into mysql.com:/misc/mysql/34731/50-34731 sql/opt_range.cc: Auto merged mysql-test/r/range.result: manual merge mysql-test/t/range.test: manual merge	18 years ago
unknown	9aaab69ab1	Apply innodb-5.1-ss2360 snapshot Fixes: - Bug #34920: auto_increment resets to 1 on foreign key creation We need to use/inherit the passed in autoinc counter for ALTER TABLE statements too. mysql-test/r/innodb.result: Apply innodb-5.1-ss2360 snapshot Revision r2345: branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc counter for ALTER TABLE statements too. mysql-test/t/innodb.test: Apply innodb-5.1-ss2360 snapshot Revision r2345: branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc counter for ALTER TABLE statements too. storage/innobase/dict/dict0dict.c: Apply innodb-5.1-ss2360 snapshot Revision r2353: branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed the assertion where it crashed previously, since the type has now changed to unsigned, it doesn't make sense to check for < 0. Added new tests, to check for overflow, for the different INT types supported for both signed and unsigned. storage/innobase/handler/ha_innodb.cc: Apply innodb-5.1-ss2360 snapshot Revision r2353: branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed the assertion where it crashed previously, since the type has now changed to unsigned, it doesn't make sense to check for < 0. Added new tests, to check for overflow, for the different INT types supported for both signed and unsigned. Revision r2345: branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc counter for ALTER TABLE statements too. storage/innobase/handler/ha_innodb.h: Apply innodb-5.1-ss2360 snapshot Revision r2353: branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed the assertion where it crashed previously, since the type has now changed to unsigned, it doesn't make sense to check for < 0. Added new tests, to check for overflow, for the different INT types supported for both signed and unsigned. storage/innobase/include/dict0dict.h: Apply innodb-5.1-ss2360 snapshot Revision r2353: branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed the assertion where it crashed previously, since the type has now changed to unsigned, it doesn't make sense to check for < 0. Added new tests, to check for overflow, for the different INT types supported for both signed and unsigned. storage/innobase/include/dict0mem.h: Apply innodb-5.1-ss2360 snapshot Revision r2353: branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed the assertion where it crashed previously, since the type has now changed to unsigned, it doesn't make sense to check for < 0. Added new tests, to check for overflow, for the different INT types supported for both signed and unsigned. storage/innobase/include/row0sel.h: Apply innodb-5.1-ss2360 snapshot Revision r2353: branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed the assertion where it crashed previously, since the type has now changed to unsigned, it doesn't make sense to check for < 0. Added new tests, to check for overflow, for the different INT types supported for both signed and unsigned. storage/innobase/include/univ.i: Apply innodb-5.1-ss2360 snapshot Revision r2353: branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed the assertion where it crashed previously, since the type has now changed to unsigned, it doesn't make sense to check for < 0. Added new tests, to check for overflow, for the different INT types supported for both signed and unsigned. storage/innobase/row/row0sel.c: Apply innodb-5.1-ss2360 snapshot Revision r2353: branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed the assertion where it crashed previously, since the type has now changed to unsigned, it doesn't make sense to check for < 0. Added new tests, to check for overflow, for the different INT types supported for both signed and unsigned.	18 years ago
unknown	b90296c70a	view.result: Post-merge fix (bug #35193). mysql-test/r/view.result: Post-merge fix (bug #35193).	18 years ago
unknown	9179e20a34	Merge host.loc:/home/uchum/work/5.0-opt into host.loc:/home/uchum/work/5.1-opt mysql-test/r/view.result: Merge with 5.0-opt (bug#35193). mysql-test/t/view.test: Merge with 5.0-opt (bug#35193). sql/sql_select.cc: Merge with 5.0-opt (bug#35193).	18 years ago
unknown	c3f2e30320	Merge host.loc:/home/uchum/work/5.0-opt-35193 into host.loc:/home/uchum/work/5.0-opt	18 years ago
unknown	321f392f62	Post-merge fix. Query cache does now work with concurrent_insert=0. See Bug 33756 - query cache with concurrent_insert=0 appears broken	18 years ago
unknown	0b8342ba4e	Fixed bug #35193 . View definition as SELECT ... FROM DUAL WHERE ... has valid syntax, but use of such view in SELECT or SHOW CREATE VIEW syntax causes unexpected syntax error. Server omits FROM DUAL clause when storing view body string in a .frm file for further evaluation. However, syntax of SELECT-witout-FROM query is more restrictive than SELECT FROM DUAL syntax, and doesn't allow the WHERE clause. NOTE: this syntax difference is not documented. View registration procedure has been modified to preserve original structure of view's body. mysql-test/r/view.result: Added test case for bug #35193. mysql-test/t/view.test: Added test case for bug #35193. sql/sql_select.cc: Fixed bug #35193. The st_select_lex::print function always omits FROM DUAL clause, even if original SELECT query has the WHERE clause. The mysql_register_view function uses this function to reconstruct a body of view's AS clause for further evaluation and stores that reconstructed clause in a .frm file. SELECT without FROM syntax is more restrictive than SELECT FROM DUAL syntax: second one allows the WHERE clause, but first one is not. Use of this view in SELECT or SHOW CREATE VIEW queries causes unexpected syntax errors. The st_select_lex::print function has been modified to reconstruct FROM DUAL clause in queries when needed. TODO: Syntax difference is not documented and should be eliminated, however improvement of the SELECT-without-FROM syntax is not trivial and leads to significant modification of grammar file because of additional shift/reduce conflicts.	18 years ago
unknown	c932049cbd	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build	18 years ago
unknown	19afc9d9e7	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build	18 years ago
unknown	3834b3d51c	Merge kaamos.(none):/data/src/bugteam/bug34928/my51 into kaamos.(none):/data/src/bugteam/mysql-5.1-bugteam	18 years ago

1 2 3 4 5 ...

53738 Commits (2e12a17d17bacd3a5e976c8ea0eb6e25711ced17) All Branches Search

53738 Commits (2e12a17d17bacd3a5e976c8ea0eb6e25711ced17)

All Branches