Commit graph

68820 commits

Author SHA1 Message Date
Sergey Glukhov
2bcaf27144 5.1 -> 5.5 merge 2011-03-28 17:33:35 +04:00
Sergey Glukhov
9d1c240ac2 Bug#11766087 59125: VALGRIND UNINITIALISED VALUE WARNING IN ULL2DEC, LONGLONG2DECIMAL
Valgrind warning happens due to missing NULL value check in
Item_func::val_decimal. The fix is to add this check.
2011-03-28 17:27:44 +04:00
Sergey Glukhov
9893d60e4f Bug#11765216 58154: UNINITIALIZED VARIABLE FORMAT IN STR_TO_DATE FUNCTION
Valgrind warning happens due to uninitialized cached_format_type field
which is used later in Item_func_str_to_date::val_str method.
The fix is to init cached_format_type field.
2011-03-28 17:24:25 +04:00
Georgi Kodinov
7dca4626fb merge mysql-5.1->mysql-5.5 2011-03-28 13:57:54 +03:00
Georgi Kodinov
9b7c15beae Added support for VS10.
Fixed RelWithDebugInfo bzr ignores.
2011-03-28 13:43:30 +03:00
Georgi Kodinov
f6ac2f5fbd Fixed a test failure becase of a new warning caused by the fix for
Bug #11766769
2011-03-28 13:32:25 +03:00
Georgi Kodinov
792781f982 Fixed a test failure in embedded because of the fix for BUG#11766769 2011-03-28 13:25:03 +03:00
Sergey Glukhov
5534b06d53 5.1->5.5 merge 2011-03-28 13:11:48 +04:00
Sergey Glukhov
26a58b5841 automerge 2011-03-28 13:09:32 +04:00
Sergey Glukhov
2db0641a60 automerge 2011-03-28 13:09:02 +04:00
Sergey Glukhov
514be8922b 5.1 -> 5.5 merge 2011-03-28 12:52:47 +04:00
Magne Mahre
41c4f566b6 Null merge 2011-03-28 10:49:43 +02:00
Magne Mahre
4c4cb80b0a Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1
The LGPL license is used in some legacy code, and to
adhere to current licensing polity, we remove those
files that are no longer used, and reorganize the
remaining LGPL code so it will be GPL licensed from
now on.
      
Note:  This patch only removed LGPL licensed files
       in MySQL 5.1, and is the second of a set of
       patches to remove LGPL from all trees.
       (See Bug# 11840513 for details)
2011-03-28 10:47:30 +02:00
Sergey Glukhov
86c1225699 Bug#11764994 57900: CREATE TABLE .. SELECT ASSERTS SCALE >= 0 && PRECISION > 0 && SCALE <= PR
Assert fails due to overflow which happens in
Item_func_int_val::fix_num_length_and_dec() as
geometry functions have max_length value equal to
max_field_size(4294967295U). The fix is to skip
max_length calculation for some boundary cases.
2011-03-28 12:35:50 +04:00
Sergey Glukhov
b6c56f465c Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > 0 && SCALE <= PRE
Assertion happens due to missing initialization of unsigned_flag
for Item_func_set_user_var object. It leads to incorrect
calculation of decimal field size.
The fix is to add initialization of unsigned_flag.
2011-03-28 12:28:30 +04:00
Sergey Glukhov
315ce7bf4f 5.1->5.5 merge 2011-03-28 12:03:53 +04:00
Sergey Glukhov
e9935c6363 Bug#11766112 59151:UNINITIALIZED VALUES IN EXTRACT_DATE_TIME WITH STR_TO_DATE(SPACE(..) ...
Valgrind warining happens due to missing
'end of the string' check. The fix is to
check if we reached the end of the string.
2011-03-28 11:53:18 +04:00
Alfranio Correia
ca5fa25bc1 Fixing test case that is sporadically failing. 2011-03-25 15:28:11 +00:00
Magnus Blåudd
2953b82685 Merge 2011-03-25 15:41:51 +01:00
Sven Sandberg
732992c693 Merged BUG#11766427, BUG#59539 from 5.1 to 5.5.
No conflicts.
2011-03-25 15:35:45 +01:00
Sven Sandberg
257e39aa44 BUG#11766427, BUG#59539: Filter by server id in mysqlbinlog fails
Problem: mysqlbinlog --server-id may filter out Format_description_log_events.
If mysqlbinlog does not process the Format_description_log_event,
then mysqlbinlog cannot read the rest of the binary log correctly.
This can have the effect that mysqlbinlog crashes, generates an error,
or generates output that causes mysqld to crash, generate an error,
or corrupt data.
Fix: Never filter out Format_description_log_events. Also, never filter
out Rotate_log_events.
2011-03-25 15:16:13 +01:00
Magnus Blåudd
ab33d3ef2b Merge 2011-03-25 15:03:44 +01:00
Georgi Kodinov
52a01765bd merge 2011-03-25 14:58:49 +02:00
Georgi Kodinov
aee26192c7 merge 2011-03-25 14:57:25 +02:00
Georgi Kodinov
200151808b merge 2011-03-25 14:57:18 +02:00
Georgi Kodinov
1e1ebd7a57 Merged bug #11766769 to 5.5.
Added back the specific warning number.
2011-03-25 14:55:22 +02:00
Luis Soares
02541101ee BUG#11766865: Automerged mysql-5.1 into mysql-5.5. 2011-03-25 12:13:17 +00:00
Georgi Kodinov
c7b83484b5 Bug #11766769: 59959: SMALL VALUES OF --MAX-ALLOWED-PACKET
ARE NOT BEING HONORED

max_allowed_packet works in conjunction with net_buffer_length.
max_allowed_packet is an upper bound of net_buffer_length.
So it doesn't make sense to set the upper limit lower than the value.
Added a warning (using ER_UNKNOWN_ERRROR and a specific message)
when this is done (in the log at startup and when setting either 
max_allowed_packet or the net_buffer_length variables)
Added a test case.
Fixed several tests that broke the above rule.
2011-03-25 12:57:27 +02:00
Magnus Blåudd
3d8d672450 Bug#60111 storage type for table not saved in .frm
(aka BUG#11766883)
  - fix review comments
  - Rewrite last usage of handler::get_tablespace_name to use
    table->s->tablespace directly
  - Remove(revert) the addition of default implementation for
    handler::get_tablespace_name
  - Add comments describing the new TABLE_SHARE members default_storage_media
    and tablespace
  - Fix usage of incorrect mask for column_format bits, i.e COLUMN_FORMAT_MASK
2011-03-25 10:06:07 +01:00
Luis Soares
155f82cfc9 BUG#11765446 (BUG#58416)
Removing the test case from mysql-5.5 list of disabled
test cases for the binlog suite. Actually, the test does
not exist in mysql-5.5, thus this is just a clean up.
2011-03-24 14:39:45 +00:00
Luis Soares
f0edc626d0 BUG#11765446 (BUG#58416)
Original patch did not remove the test case from the list
of disabled test cases. Removing it now!
2011-03-24 14:37:12 +00:00
Luis Soares
ee1f95dccc Automerging bzr bundle attached to bug report into latest mysql-5.1. 2011-03-24 10:58:48 +00:00
Luis Soares
16e4677c5d BUG#11766865: 60091: RBR + NO PK + UPDATE NULL VALUE --> SLAVE BREAK WITH ERROR HA_ERR_END_OF_
The slave was not able to find the correct row in the innodb
table, because the row fetched from the innodb table would not
match the before image. This happened because the (don't care)
bytes in the NULLed fields would change once the row was stored
in the storage engine (from zero to the default value). This
would make bulk memory comparison (using memcmp) to fail.
  
We fix this by taking a preventing measure and avoiding memcmp
for tables that contain nullable fields. Therefore, we protect
the slave search routine from engines that return arbitrary
values for don't care bytes (in the nulled fields). Instead, the
slave thread will only check null_bits and those fields that are
not set to NULL when comparing the before image against the
storage engine row.
2011-03-24 10:52:40 +00:00
Georgi Kodinov
9c232a2c82 Bug #11766306: 59393: have_innodb=yes when mysqld started with --skip-innodb
Initialized correctly the have_innodb variable so that when the plugin is not initialized it
stays "disabled" instead of "yes".
Test suite added.
2011-03-23 19:03:42 +02:00
Bjorn Munch
f49019547b null upmerge 2011-03-23 11:08:18 +01:00
Bjorn Munch
f816635779 merge from 5.5-mtr 2011-03-23 11:06:42 +01:00
Bjorn Munch
67319231e8 merge from 5.1-mtr 2011-03-23 10:48:09 +01:00
Magne Mahre
53486e71a0 Null merge 2011-03-22 16:29:51 +01:00
Magne Mahre
62930fa17d Null merge (from mysql-5.0) 2011-03-22 16:28:42 +01:00
Magne Mahre
40af59490e Post-push fix for Bug 11896296
Didn't build on Solaris.
2011-03-22 16:27:32 +01:00
Bjorn Munch
356a8031cc null upmerge 2011-03-22 16:04:34 +01:00
Bjorn Munch
0563ff5ec5 merge from 5.5 main 2011-03-22 15:40:25 +01:00
Bjorn Munch
4619d5c107 merge from 5.1 main 2011-03-22 15:38:41 +01:00
Magne Mahre
efc73eca38 Null merge 2011-03-22 13:56:15 +01:00
Magne Mahre
e694249886 Null merge 2011-03-22 13:53:35 +01:00
Magne Mahre
7606856e48 Bug#11896296 REMOVE LGPL LICENSED FILES IN MYSQL 5.0
The LGPL license is used in some legacy code, and to
adhere to current licensing polity, we remove those
files that are no longer used, and reorganize the
remaining LGPL code so it will be GPL licensed from
now on.

Note:  This patch only removed LGPL licensed files
       in MySQL 5.0, and is the first of a set of
       patches to remove LGPL from all trees.
       (See Bug# 11840513 for details)
2011-03-22 13:50:14 +01:00
Alexander Nozdrin
ae03e16b24 A patch for Bug#11763413 (56115: SELECT doesn't work in
prepared statements with cursor protocol).

The problem was a bug in Materialized-cursor implementation.
Materialized_cursor::open() called send_result_metadata()
with items pointing to already closed table.

The fix is to send metadata when the table is still open.

NOTE: this is a "partial" fix: metadata are different with
and without --cursor-protocol, but that's a different large
problem, one indication of which is reported as Bug 24176.
2011-03-22 14:48:56 +03:00
Georgi Kodinov
5ad3f44337 merge mysql-5.1->mysql-5.5 2011-03-22 13:08:28 +02:00
Vinay Fisrekar
2233d6cc0d Bug#11766500 - 59624: FUNCS_1 SUITE TESTS FAILING WITH RESULT DIFFERENCE WHEN RUN USING EMBEDDED MODE
Updating result file for embedded mode tests due to recent changes
2011-03-22 10:02:51 +05:30
Mayank Prasad
0d8ecc1fb9 merge from 5.1 to 5.5 for bug#11751148 2011-03-21 21:39:40 +05:30