summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WL#5151: Conversion between different types whenMats Kindahl2010-01-132-21/+46
| | | | | | | | | | | | | | | | | replicating Replace c_ptr() calls with c_ptr_safe() calls to avoid valgrind warnings. Adding code to to handle the case that no metadata was present in the table map for the column. Allow first parameter to unpack_row() to be NULL, in which case no source tables is used and hence no checks nor conversions are done. Clarifying some comments and fixing documentation for unpack_row().
* WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-213-0/+15
| | | | | | | | | | | | | | | | Bug#49836 reports that the geometry type does not work with WL#5151 applied. The GEOMETRY type inherits the blob comparison function, which read the pack length from the metadata. The GEOMETRY type does not fill in the metadata with anything sensible, so it is always zero, meaning that the pack length for the source type is considered zero, rendering it always "smaller" than the target type which has pack length 4 (without pointer). This patch fixes the problem by defining Field_geom::pack_length_from_metadata() to always use the same as Field_geom::row_pack_length().
* WL#5151: Conversion between different typesMats Kindahl2009-12-183-0/+45
| | | | | | | | | | | | | | | | | when replicating The function create_virtual_tmp_table does not set db_low_byte_first in the same way as create_tmp_table does, causing copying from the virtual table to a real table to get strange values for SET types on big-endian machines. mysql-test/extra/rpl_tests/type_conversions.test: Adding tests for converting between different-sized sets. sql/sql_select.cc: Settng dh_low_byte_first for tables created with create_virtual_tmp_table.
* WL#5151: Conversion between different types whenMats Kindahl2009-12-165-94/+99
| | | | | | | | | | | | replicating Fixes to make mysqlbinlog work correctly and updates to rpl_ndb result files. sql/log_event.cc: The processing of the MYSQL_STRING_TYPE is now done in table_def::type(), so the support functions for mysqlbinlog are changed to work correctly.
* WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-162-15/+14
| | | | Fixes to get it to compile on MacOSX.
* BUG#49618: Field length stored incorrectly in binary logMats Kindahl2009-12-1510-35/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for InnoDB The class Field_bit_as_char stores the metadata for the field incorrecly because bytes_in_rec and bit_len are set to (field_length + 7 ) / 8 and 0 respectively, while Field_bit has the correct values field_length / 8 and field_length % 8. Solved the problem by re-computing the values for the metadata based on the field_length instead of using the bytes_in_rec and bit_len variables. To handle compatibility with old server, a table map flag was added to indicate that the bit computation is exact. If the flag is clear, the slave computes the number of bytes required to store the bit field and compares that instead, effectively allowing replication *without conversion* from any field length that require the same number of bytes to store. mysql-test/suite/rpl/t/rpl_typeconv_innodb.test: Adding test to check compatibility for bit field replication when using InnoDB. sql/field.cc: Extending compatible_field_size() with flags from table map to allow fields to check master info. sql/field.h: Extending compatible_field_size() with flags from table map to allow fields to check master info. sql/log.cc: Removing table map flags since they are not used outside table map class. sql/log_event.cc: Removing flags parameter from table map constructor since it is not used and does not have to be exposed. sql/log_event.h: Adding flag to denote that bit length for bit field type is exact and not potentially rounded to even bytes. sql/rpl_utility.cc: Adding fields to table_def to store table map flags. sql/rpl_utility.h: Removing obsolete comment and adding flags to store table map flags from master.
* WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-142-13/+7
| | | | | | Fixing minor error when printing SQL types from master and cleaning some code. Updating result files.
* WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-1439-464/+2893
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Row-based replication requires the types of columns on the master and slave to be approximately the same (some safe conversions between strings are allowed), but does not allow safe conversions between fields of similar types such as TINYINT and INT. This patch implement type conversions between similar fields on the master and slave. The conversions are controlled using a new variable SLAVE_TYPE_CONVERSIONS of type SET('ALL_LOSSY','ALL_NON_LOSSY'). Non-lossy conversions are any conversions that do not run the risk of losing any information, while lossy conversions can potentially truncate the value. The column definitions are checked to decide if the conversion is acceptable. If neither conversion is enabled, it is required that the definitions of the columns are identical on master and slave. Conversion is done by creating an internal conversion table, unpacking the master data into it, and then copy the data to the real table on the slave. .bzrignore: New files added client/Makefile.am: New files added client/mysqlbinlog.cc: Functions in rpl_utility.cc is now needed by mysqlbinlog.cc. libmysqld/Makefile.am: New files added mysql-test/extra/rpl_tests/check_type.inc: Test include file to check a single type conversion. mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test: Switching to use INT instead of TEXT for column that should not have matching types. mysql-test/extra/rpl_tests/rpl_row_basic.test: Adding code to enable type conversions for BIT tests since InnoDB cannot handle them properly due to incorrect information stored as metadata. mysql-test/extra/rpl_tests/type_conversions.test: Test file to check a set of type conversions with current settings of slave_type_conversions. mysql-test/suite/rpl/t/rpl_typeconv.test: Test file to test conversions from master to slave with all possible values for slave_type_conversions. The test also checks that the slave_type_conversions variable works as expected. sql/field.cc: Changing definition of compatible_field_size to both check if two field with identical base types are compatible and give an order between them if they are compatible. This only implement checking on the slave, so it will not affect replication from an old master to a new slave. sql/field.h: Changing prototypes for functions: - compatible_field_size() - init_for_tmp_table() - row_pack_length() sql/log_event.cc: Changing compability checks to build a conversion table if the fields are compatible, but does not have the same base type. sql/log_event_old.cc: Changing compability checks to build a conversion table if the fields are compatible, but does not have the same base type. sql/mysql_priv.h: Adding global option variable for SLAVE_TYPE_CONVERSIONS sql/mysqld.cc: Adding SLAVE_TYPE_CONVERSIONS global server variable. sql/rpl_record.cc: Changing unpack_row to use the conversion table if present. sql/rpl_rli.h: Removing function get_tabledef and replacing it with get_table_data(). This function retrieve data for table opened for replication, not just table definition. sql/rpl_utility.cc: Function table_def::compatible_with is changed to compare table on master and slave for compatibility and generate a conversions table if they are compatible. Computing real type of fields from metadata for ENUM and SET types. Computing pack_length correctly for ENUM, SET, and BLOB types. Adding optimization to not check compatibility if no slave type conversions are enabled. sql/rpl_utility.h: Changing prototypes since implementation has changed. Modifying table_def::type() to return real type instead of stored type. sql/set_var.cc: Adding SLAVE_TYPE_CONVERSIONS variable. sql/set_var.h: Adding SLAVE_TYPE_CONVERSIONS variable. sql/share/errmsg.txt: Adding error messages for slave type conversions. sql/sql_class.h: Adding SLAVE_TYPE_CONVERSIONS variable. sql/sql_select.cc: Correcting create_virtual_tmp_table() to compute null bit positions correctly in the presence of bit fields.
* merge from 5.1-mtrBjorn Munch2009-10-2113-37/+129
|\
| * merge 48149Bjorn Munch2009-10-202-1/+13
| |\
| | * Bug #48149 MTR should automatically skip SSL tests if SSL not supportedBjorn Munch2009-10-192-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Knowledge of no SSL support is not used Skip tests the same way e.g. innodb tests are Does not refer to have_ssl_communication.inc, will add this when merging to 6.0-codebase
| * | merge 48130 and 48133Bjorn Munch2009-10-192-2/+5
| |\ \ | | |/
| | * Bug #48133 MTR should not dump entire history of mysqld log when failing to ↵Bjorn Munch2009-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | | start server Don't print entire log, but use extract_server_log() introduced by 46007
| | * Bug #48130 Expected failures should not count towards max-test-failBjorn Munch2009-10-172-1/+3
| | | | | | | | | | | | | | | | | | Test batches may be terminated too early Avoid counting exp-fail tests
| * | merge from 5.1 mainBjorn Munch2009-10-16400-3563/+14921
| |\ \ | |/ / |/| / | |/
* | Upmerge merge changesets.Joerg Bruehe2009-10-160-0/+0
|\ \
| * \ Merge 5.0-bugteam (compile fix) into main 5.0Joerg Bruehe2009-10-161-0/+4
| |\ \
| | * \ Merge the Windows compile fix into the push tree.Joerg Bruehe2009-10-161-1/+1
| | |\ \
* | | \ \ Merge a compile fix.Joerg Bruehe2009-10-162-2/+2
|\ \ \ \ \
| * \ \ \ \ Upmerge the Windows compile fix from 5.0 to 5.1Joerg Bruehe2009-10-161-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Compile fix for Windows:Joerg Bruehe2009-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "#ifdef", not plain "#if".
* | | | | | Upmerge a merge changeset - no contents change.Joerg Bruehe2009-10-160-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge bug fix into push tree.Joerg Bruehe2009-10-151-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | mergeGeorgi Kodinov2009-10-163-31/+0
|\ \ \ \ \ \
| * | | | | | Revert the fix for bug #47123 until test suite failures are resolved.Georgi Kodinov2009-10-163-31/+0
| | | | | | |
| * | | | | | version changeGeorgi Kodinov2009-10-151-1/+1
| | | | | | |
* | | | | | | Merge the bug fixes into the push tree.Joerg Bruehe2009-10-152-4/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Fix Bug #47957Joerg Bruehe2009-10-091-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A build "--without-server" fails if using "--with-ssl" (YaSSL) The problem was the lack of directory "extra" in a build which did not include the server. configure.in: 1) Ensure "extra" is in the list of client directories. 2) Always handle the client directories first, as they will be contained in every build (we have client-only, but not server-only).
| * | | | | Upmerge (automerge) into 5.1Joerg Bruehe2009-10-091-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix bug#47923 New "mf_keycache.c" requires thread supportJoerg Bruehe2009-10-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug is a compilation issue: Function "find_key_block()" had thread operations which were not guarded by "#if THREAD", add that now. mysys/mf_keycache.c: Without thread-support, we are in a single-threaded world, so there is no parallelism, and the keycache cannot be within a resize operation while this request is being processed.
* | | | | | mergeGeorgi Kodinov2009-10-150-0/+0
|\ \ \ \ \ \
| * | | | | | Marked all the NDB related tests experimental as agreed with Bernard Ocklin.Georgi Kodinov2009-10-151-5/+37
| | | | | | |
* | | | | | | All NDB tests made experimental after a discussion with Bernhard Ocklin.Georgi Kodinov2009-10-151-5/+37
|/ / / / / /
* | | | | | Manual merge.Alexey Kopytov2009-10-153-0/+31
|\ \ \ \ \ \
| * | | | | | Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN Alexey Kopytov2009-10-133-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was in incorrect handling of predicates involving NULL as a constant value by the range optimizer. For example, when creating a SEL_ARG node from a condition of the form "field < const" (which would normally result in the "NULL < field < const" SEL_ARG), the special case when "const" is NULL was not taken into account, so "NULL < field < NULL" was produced for the "field < NULL" condition. As a result, SEL_ARG structures of this form could not be further optimized which in turn could lead to incorrectly constructed SEL_ARG trees. In particular, code assuming SEL_ARG structures to always form a sequence of ordered disjoint intervals could enter an infinite loop under some circumstances. Fixed by changing get_mm_leaf() so that for any sargable predicate except "<=>" involving NULL as a constant, "empty" SEL_ARG is returned, since such a predicate is always false. mysql-test/r/range.result: Added a test case for bug #47123. mysql-test/t/range.test: Added a test case for bug #47123. sql/opt_range.cc: Fixed get_mm_leaf() so that for any sargable predicate except "<=>" involving NULL as a constant, "empty" SEL_ARG is returned, since such a predicate is always false.
* | | | | | | Disabled part of test for BUG#47073 until additional fix is pushed.Sergey Vojtovich2009-10-152-11/+7
| | | | | | |
* | | | | | | mergeJorgen Loland2009-10-143-12/+26
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ mergeGeorgi Kodinov2009-10-1416-164/+393
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ mergeGeorgi Kodinov2009-10-141-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | version changeGeorgi Kodinov2009-10-141-1/+1
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | mergeGeorgi Kodinov2009-10-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merged main to mysql-5.0-bugteamGeorgi Kodinov2009-10-142-3/+3
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Null-merge from mysql-5.0.84sp1-releaseunknown2009-10-140-0/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | Backport into build-200909301147-5.0.84sp1MySQL Build Team2009-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 2802.1.1 > tags: mysql-5.0.86 > revision-id: hery.ramilison@sun.com-20090909185217-mooeczu391ztp2fz > parent: joro@sun.com-20090902123318-8qe40pr91xmui5ue > committer: hery <hery.ramilison@sun.com> > branch nick: mysql-5.0.86-release > timestamp: Wed 2009-09-09 20:52:17 +0200 > message: > change c++ comment to c comment
| | | | * | | | | | Backport into build-200909301147-5.0.84sp1MySQL Build Team2009-09-305-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 2796 > revision-id: sergey.glukhov@sun.com-20090827102219-sgjz0v5t1rfccs14 > parent: joro@sun.com-20090824122803-1d5jlaysjc7a7j6q > committer: Sergey Glukhov <Sergey.Glukhov@sun.com> > branch nick: mysql-5.0-bugteam > timestamp: Thu 2009-08-27 15:22:19 +0500 > message: > Bug#46184 Crash, SELECT ... FROM derived table procedure analyze > The crash happens because select_union object is used as result set > for queries which have derived tables. > select_union use temporary table as data storage and if > fields count exceeds 10(count of values for procedure ANALYSE()) > then we get a crash on fill_record() function.
| | | | * | | | | | Backport into build-200909301147-5.0.84sp1MySQL Build Team2009-09-303-12/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 2791.2.3 > revision-id: joro@sun.com-20090827114042-h55n7qp9990bl6ge > parent: anurag.shekhar@sun.com-20090831073231-e55y1hsck6n08ux8 > committer: Georgi Kodinov <joro@sun.com> > branch nick: B46749-5.0-bugteam > timestamp: Thu 2009-08-27 14:40:42 +0300 > message: > Bug #46749: Segfault in add_key_fields() with outer subquery level > field references > > This error requires a combination of factors : > 1. An "impossible where" in the outermost SELECT > 2. An aggregate in the outermost SELECT > 3. A correlated subquery with a WHERE clause that includes an outer > field reference as a top level WHERE sargable predicate > > When JOIN::optimize detects an "impossible WHERE" it will bail out > without doing the rest of the work and initializations. It will not > call make_join_statistics() as well. And make_join_statistics fills > in various structures for each table referenced. > When processing the result of the "impossible WHERE" the query must > send a single row of data if there are aggregate functions in it. > In this case the server marks all the aggregates as having received > no rows and calls the relevant Item::val_xxx() method on the SELECT > list. However if this SELECT list happens to contain a correlated > subquery this subquery is evaluated in a normal evaluation mode. > And if this correlated subquery has a reference to a field from the > outermost "impossible where" SELECT the add_key_fields will mistakenly > consider the outer field reference as a "local" field reference when > looking for sargable predicates. > But since the SELECT where the outer field reference refers to is not > completely initialized due to the "impossible WHERE" in this level > we'll get a NULL pointer reference. > Fixed by making a better condition for discovering if a field is "local" > to the SELECT level being processed. > It's not enough to look for OUTER_REF_TABLE_BIT in this case since > for outer references to constant tables the Item_field::used_tables() > will return 0 regardless of whether the field reference is from the > local SELECT or not.
| | | | * | | | | | Set version number for mysql-5.0.84sp1 releaseunknown2009-09-301-1/+1
| | | | | | | | | |
| | | * | | | | | | Raise version number after cloning 5.0.87unknown2009-10-131-2/+2
| | | | | | | | | |
| | * | | | | | | | "MySQL Network" => "MySQL Enterprise"Kent Boortz2009-10-081-1/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | merged 5.1-mainGeorgi Kodinov2009-10-143-12/+26
| |\ \ \ \ \ \ \ \