1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-15 08:21:24 +03:00
Commit Graph

29385 Commits

Author SHA1 Message Date
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
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
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
Tor Didriksen
4a6d020e8d Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIES
This is a backport of
Bug #46860 Crash/segfault using EXPLAIN EXTENDED on query using UNION in subquery.
2011-03-24 11:27:11 +01: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
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
Sunanda Menon
5dc4f1ef42 merge 2011-03-22 14:34:04 +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
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
Mayank Prasad
140b9093e2 Bug #11751148 : show events shows events in other schema
Issue:
------
Due to prefix match, database like 'k' was matching with 'ka' and events of 'ka' we getting displayed for 'show event' of 'k'.

Resolution:
-----------
Scan for listing of events in a schema is made to be done on exact match of database (schema) name instead of just prefix.
2011-03-21 21:32:47 +05:30
Georgi Kodinov
ba6cf08db5 merge mysql-5.5->mysql-5.5-security 2011-03-21 16:22:13 +02:00
Georgi Kodinov
7ee51233da merge mysql-5.1->mysql-5.1-security 2011-03-21 16:01:40 +02:00
Ramil Kalimullin
49ee8db5df Fix for bug#51875/#11759554 backported from mysql-5.1. 2011-03-21 09:21:14 +03:00
Georgi Kodinov
eb3981ddb7 merge 2011-03-18 17:00:13 +02:00
Georgi Kodinov
52edb4a5b9 Bug # 11766011: mysql.user.authentication_string column causes
configuration wizard to fail

Made the fields mysql.user.plugin and mysql.user.authentication_string
nullable to conform with some older clients doing inserts instead of 
using the commands.
2011-03-18 16:16:17 +02:00
Tor Didriksen
8efbb825de local merge 2011-03-18 13:38:18 +01:00
Vinay Fisrekar
652f2b6f4b up-merge 5.1 --> 5.5
+
Bug#11766500 - 59624: FUNCS_1 SUITE TESTS FAILING WITH RESULT DIFFERENCE WHEN RUN USING EMBEDDED MODE
      
Updating result files for embedded mode
2011-03-18 16:44:42 +05:30
Vinay Fisrekar
e8ad8f4fd8 Bug#11766500 - 59624: FUNCS_1 SUITE TESTS FAILING WITH RESULT DIFFERENCE WHEN RUN USING EMBEDDED MODE
Updating result files
2011-03-18 16:35:57 +05:30
Georgi Kodinov
0ded0c6f60 Bug #11766854 addendum :
Fixed test suite failures when the auth plugin is not compiled in.
2011-03-18 10:31:39 +01:00
Georgi Kodinov
cc1b046c3e Bug #11766854: 60075: MYSQL_LOAD_CLIENT_PLUGIN DOESN'T CLEAR ERROR
Added the cleanup code.
Extended mysql_client_test to take --plugin-dir and --default_auth.
Added a C test case.
2011-03-17 15:52:49 +02:00
Alfranio Correia
6cafefd2a5 merge mysql-5.5 (local) --> mysql-5.5 2011-03-17 13:25:44 +00:00
Nirbhay Choubey
bb0c50c7b1 BUG#11766184 - 59234 : cmdline clients crash --defaults-extra-file
with no .cnf or .ini extension.

Fix for this bug was pushed as part of Bug#11765482.
2011-03-17 18:01:06 +05:30
Alfranio Correia
84e27741d2 merge mysql-5.5 (local) --> mysql-5.5 2011-03-17 12:12:25 +00:00
Georgi Kodinov
5a3586b1c3 Fixed the test cleanup code post-merge 2011-03-17 14:07:18 +02:00
Georgi Kodinov
4892944d63 merged mysql-5.5->mysql-5.5-security 2011-03-17 13:02:19 +02:00
Nirbhay Choubey
9c08717aa0 Merge from mysql-5.1 -> mysql-5.5. 2011-03-17 16:31:31 +05:30
Georgi Kodinov
a9f1e2776d merge 5.1->5.1-security 2011-03-17 13:00:09 +02:00
Nirbhay Choubey
da70b67a41 Minor fix in mysqldump test. 2011-03-17 16:28:16 +05:30
Sven Sandberg
c0613a9fd7 BUG#11877618: rpl_slave_net_timeout fails in rpl_sync.inc (at sync_slave_with_master)
Problem: the test had not been updated after BUG#49978 was pushed
Fix: add 'set $rpl_only_running_threads= 1' to the end of the test
and update the result file.
Also, use include/assert.inc for an assertion (instead of relying
on result file comparison).
Also, move 'set @@global.slave_net_timeout' forwards, to get rid
of a warning.
2011-03-17 11:31:42 +01:00
Alfranio Correia
6d07a87a58 BUG#11877568 - RPL_SEMI_SYNC FAILS IN PB
Currently, rpl_semi_sync is failing in PB due to the warning message:

  "Slave SQL: slave SQL thread is being stopped in the middle of "
  "applying of a group having updated a non-transaction table; "
  "waiting for the group completion ..."

The problem started happening after the fix for BUG#11762407 what was
automatically suppressing some warning messages.

To fix the current issue, we suppress the aforementioned warning message
and exploit the opportunity to make the sentence clearer.
2011-03-16 16:38:30 +00:00
Luis Soares
37f49e697e Fix for BUG#11868903 (BUG#59717).
Automerge: mysql-5.1 --> mysql-5.5
2011-03-16 15:16:41 +00:00
Luis Soares
f39b86d772 Fix for BUG#11868903 (BUG#59717)
There is a race between two threads: user thread and the dump
thread. The former sets a debug instruction that makes the latter wait
before processing an Xid event. There can be cases that the dump
thread has not yet processed the previous Xid event, causing it to
wait one Xid event too soon, thus causing sync_slave_with_master never
to resume.
      
We fix this by moving the instructions that set the debug variable
after calling sync_slave_with_master.
2011-03-16 15:11:54 +00:00
hery.ramilison@oracle.com
18d2e55c51 Merge from mysql-5.5.10-release 2011-03-16 15:11:20 +01:00
Mattias Jonsson
11ad61f8c4 Bug#11746819:
Bug#28928: UNIX_TIMESTAMP() should be considered unary monotonic by partition pruning

Made UNIX_TIMESTAMP MONOTONIC_INCREASING when it have TIMESTAMP argument (only).
2011-03-16 11:59:01 +01:00
Serge Kozlov
5aed245098 bug#58525 postfix 2011-03-16 00:46:30 +03:00