mariadb

Tree: ae2eafc098

Author	SHA1	Message	Date
Alexander Nozdrin	9b807ed57c	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	2283e1b510	Fix compile error (different storage class for mysql_temp_dir_list) when trying to build innodb as plugin. The reason for the error is mismatch in mysql_temp_dir_list declaration between mysqld.h and usage in ha_innodb.cc Add missing MYSQL_PLUGIN_IMPORT to mysql_tmpdir_list (variables exported by the server and used by plugin need it).	16 years ago
Alexander Nozdrin	50ff451566	A post-fix patch for WL#4877/WL#5030: Fix tons of warnings about mismatch struct and class usage.	16 years ago
Marc Alff	7decb1b928	Bug#52754 Build break in mysql-trunk, performance schema unit test Tree cleaup after the last major merges in mysql-trunk: The files sql/lex_hash.h and sql/sql_yacc.h are automatically generated, and should not be checked in the configuration management system. These files are now removed. No changes are required for .bzrignore, which already listed these files (and similar files in libmysqld/). The file storage/perfschema/unittest/pfs_timer-t.cc did not build after the header files refactoring affecting mysql_priv.h The file now builds properly using sql_priv.h	16 years ago
Alexey Kopytov	55252a1c1f	Reconciling different file ids for dtoa.c in trunk and 6.0-codebase.	16 years ago
Alexey Kopytov	8ccf004f5b	Reconciling different file ids for dtoa.c in trunk and 6.0-codebase.	16 years ago
Alexey Kopytov	ab50b8885f	Automerge.	16 years ago
Alexander Nozdrin	70a04be1b8	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	5513891cc3	Make main.query_cache_debug experimental on Linux due to Bug 52356.	16 years ago
Alexander Nozdrin	5cd54c5c39	Update version tag to 5.5.5-m3.	16 years ago
Mats Kindahl	0768deeb27	WL#5030: Splitting mysql_priv.h Adding my_global.h first in all files using NO_EMBEDDED_ACCESS_CHECKS. Correcting a merge problem resulting from a changed definition of check_some_access compared to the original patches.	16 years ago
Alexey Kopytov	5a274915ec	Bug #52165 : Assertion failed: file .\dtoa.c, line 465 The failing assertion was written with the assumption that a NULL string can never be passed to my_strtod(). However, an empty string may be passed under some circumstances by passing str == NULL and *end == NULL. Fixed the assertion to take the above case into account.	16 years ago
Mats Kindahl	2c79d4d02b	WL#5030: Splitting mysql_priv.h Adding include to build on Windows.	16 years ago
Mats Kindahl	a78fe75f92	WL#5030: Splitting mysql_priv.h Adding includes of my_global.h that seems to be necessary on Windows.	16 years ago
Mats Kindahl	3467c1a7b2	WL#5030: Splitting mysql_priv.h Moving an extern "C" to not cover #includes.	16 years ago
Mats Kindahl	2e28a449fa	WL#5030: Splitting mysql_priv.h - Adding include/mysql/innodb_priv.h which was missing before. - Updated .bzrignore to ignore CMake generated cruft.	16 years ago
Mats Kindahl	df3349f0a4	WL#5030: Splitting mysql_priv.h Minor fixes required because of changes since patches were developed.	16 years ago
Mats Kindahl	8a0c1ddc60	WL#5030: Split and remove mysql_priv.h Fixing merge problem that causes CSV engine to misbehave.	16 years ago
Alfranio Correia	ec6c56ef5a	BUG#51291 Unfortunate effect around variable binlog_direct_non_transactional_updates Post-merge fix.	16 years ago
Mats Kindahl	e409d6f69c	WL#5030: Split and remove mysql_priv.h This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h	16 years ago
Alfranio Correia	2b48577cc2	auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing	16 years ago
Alfranio Correia	f7776c999e	BUG#51291 Unfortunate effect around variable binlog_direct_non_transactional_updates Added test cases to check the case where the option binlog_direct_non_transactional_updates is OFF.	16 years ago
Alfranio Correia	4d71a007ba	auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing	16 years ago
Alfranio Correia	7827688f23	BUG#51291 Unfortunate effect around variable binlog_direct_non_transactional_updates BUG#46364 introduced the flag binlog_direct_non_transactional_updates which would make N-changes to be written to the binary log upon committing the statement when "ON". On the other hand, when "OFF" the option was supposed to mimic the behavior in 5.1. However, the implementation was not mimicking the behavior correctly and the following bugs popped up: Case #1: N-changes executed within a transaction would go into the S-cache. When later in the same transaction a T-change occurs, N-changes following it were written to the T-cache instead of the S-cache. In some cases, this raises problems. For example, a Table_map_log_event being written initially into the S-cache, together with the initial N-changes, would be absent from the T-cache. This would log N-changes orphaned from a Table_map_log_event (thence discarded at the slave). (MIXED and ROW) Case #2: When rolling back a transaction, the N-changes that might be in the T-cache were disregarded and truncated along with the T-changes. (MIXED and ROW) Case #3: When a MIXED statement (TN) is ahead of any other T-changes in the transaction and it fails, it is kept in the T-cache until the transaction ends. This is not the case in 5.1 or Betony (5.5.2). In these, the failed TN statement would be written to the binlog at the same instant it had failed and not deferred until transaction end. (SBR) To fix these problems, we have decided to do what follows: For Case #1 and #2, we circumvent them: 1. by not letting binlog_direct_non_transactional_updates affect MIXED and RBR. These modes will keep the behavior provided by WL#2687. Although this will make Celosia to behave differently from 5.1, an execution will be always safe under such modes in the sense that slaves will never go out sync. In 5.1, using either MIXED or ROW while mixing N-statements and T-statements was not safe. For Case #3, we don't actually fix it. We: 1. keep it and make all MIXED statements whether they end up failing or not or whether they are up front in the transaction or after some transactional change to always be stored in the T-cache. This means that it is written to the binary log on transaction commit/rollback only. 2. We make the warning message even more specific about the MIXED statement and SBR.	16 years ago
Alfranio Correia	1ddd2ac2db	auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing	16 years ago
Alexander Nozdrin	36430c53f9	Fix use of uninitialized variable.	16 years ago
Luis Soares	c340c3aa10	BUG#52202: mysqlbinlog_row* fail in daily-trunk on Sol10 x86_64 debug_max There was a buffer overrun when unpacking the date field. Incidentaly, this seems to affect only solaris x86_64 debug builds, but others platforms may be vulnerable as well. In particular, the buffer size used was not taking into consideration that the '\0' character would be written into it. We fix this by increasing the size of the buffer used to accommodate one extra byte (the one for the '\0').	16 years ago
Alexey Kopytov	1311b45a61	Fixed mysqld--help-win broken by the merge from trunk main.	16 years ago
Joerg Bruehe	8a5aca0dc7	Add "--with-perfschema" to the configure options for RPMs.	16 years ago
Joerg Bruehe	2067e6c46f	Fix an issue with the IBM C++ compiler which was detected during the build of 5.5.3-m3. This requires version 9 of IBM C++ to help. More fixes will still be needed, it is very strict (or rather: a bit picky?) about templates.	16 years ago
Joerg Bruehe	d3c3a14e0a	Some fixes developed during the build of 5.5.3-m3 about handling the debug plugin files, also "ha_example.*" are dropped.	16 years ago
Luis Soares	b684173e33	BUG#52341: PB2: rpl tests started taking three times more time on linux x86_64 max Rpl tests were surprisingly taking too long when server was built using cmake on linux. This was because cmake counter part of patch for WL#4949 was not defining SIGNAL_WITH_VIO_CLOSE flag, which had negative impact on the time needed to stop the slave IO thread on STOP SLAVE command. We fix this by deploy the missing SET command on configure.cmake.	16 years ago
Alexey Kopytov	f10885675c	Manual merge of mysql-trunk into mysql-trunk-merge. Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/Makefile.am Text conflict in mysql-test/collections/default.daily Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in mysys/charset.c Text conflict in sql/field.cc Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_func.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysqld.cc Text conflict in sql/rpl_utility.cc Text conflict in sql/rpl_utility.h Text conflict in sql/set_var.cc Text conflict in sql/share/Makefile.am Text conflict in sql/sql_delete.cc Text conflict in sql/sql_plugin.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in storage/example/ha_example.h Text conflict in storage/federated/ha_federated.cc Text conflict in storage/myisammrg/ha_myisammrg.cc Text conflict in storage/myisammrg/myrg_open.c	16 years ago
Alexander Nozdrin	58d8bfab4f	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	c203c8daf8	Auto-merge from mysql-trunk-bugfixing.	16 years ago
Alexey Kopytov	41b6e42421	Mark all main.plugin* tests as experimental on Solaris as done in 6.0 due to bug #47146.	16 years ago
Alexey Kopytov	bbe6b90b52	Fixed the incorrectly merged rpl.rpl_show_slave_running test in mysql-trunk-merge (by copying the .result/.test files from mysql-pe).	16 years ago
Joerg Bruehe	adbd8fe6e7	Fixes related to bug#46587: archive storage engine headers don't include my_global.h first During the build of 5.5.3-m3 on older Linux platforms (kernels 2.4 or early 2.6), the symptom described in the bug report occurred both in the "archive" and in the "innobase" storage engine. This change is the patch proposed in that bug report, and a similar one in innobase, that latter is aligned with Vasil Dimov of Innobase, the original author.	16 years ago
Joerg Bruehe	82b4452bd5	Some fixes for the build on Windows as found necessary during the release build of 5.5.3-m3.	16 years ago
Alexey Kopytov	7ac059ba8f	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. Conflicts: Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in sql/item_func.cc	16 years ago
Alexander Nozdrin	bdcf08d727	Make mysqlbinlog_row, mysqlbinlog_row_innodb and mysqlbinlog_row_myisam experimental due to Bug 52202.	16 years ago
Alexander Barkov	a4332c256e	Merging the latest changes	16 years ago
Alexander Barkov	177522a4fe	Bug #51976 LDML collations issue Problem: caseup_multiply and casedn_multiply members were not initialized for a dynamic collation, so UPPER() and LOWER() functions returned empty strings. Fix: initializing the members properly. Adding tests: mysql-test/r/ctype_ldml.result mysql-test/t/ctype_ldml.test Applying the fix: mysys/charset.c	16 years ago
Mats Kindahl	e176c4162f	Merging with mysql-5.1-bugfixing.	16 years ago
Mats Kindahl	45610a66d9	BUG#49618: Field length stored incorrectly in binary log for InnoDB Patch to fix result files for the binlog suite under row- based replication.	16 years ago
John H. Embretsen	92c7521f27	Merge fix for bug 52060 into tip of 5.1-bugteam.	16 years ago
Gleb Shchepa	2758847bf2	Bug #49910 : Behavioural change in SELECT/WHERE on YEAR(4) data type (Original patch by Sinisa Milivojevic) The YEAR(4) value of 2000 was equal to the "bad" YEAR(4) value of 0000. The get_year_value() function has been modified to not adjust bad YEAR(4) value to 2000.	16 years ago
Andrei Elkin	ccdec568c1	bug#51648 comments to rpl_show_slave_running test are added to ease merging	16 years ago
Andrei Elkin	06af918e02	merging bug@51648 to 5.1-bt, pe from local bugfixing branch	16 years ago
Andrei Elkin	e1158e60ac	merging bug@51398 to trun-bf from local bf-branch	16 years ago

1 2 3 4 5 ...

61675 Commits (ae2eafc09815114aac436412ea076c81dae7248b) All Branches Search

61675 Commits (ae2eafc09815114aac436412ea076c81dae7248b)

All Branches