Commit graph

56539 commits

Author SHA1 Message Date
Georgi Kodinov
69ac16429e backport the fix for bug #37191 to 5.1-bugteam 2009-02-25 12:19:29 +02:00
Georgi Kodinov
d578311224 automerge 2009-02-25 11:46:01 +02:00
Georgi Kodinov
8fda5211e8 automerge 2009-02-25 11:34:27 +02:00
Georgi Kodinov
f8d39ad5e0 merged main into the working tree 2009-02-25 11:32:53 +02:00
Anurag Shekhar
f0ff3aaead Merging with the bugteam tree. 2009-02-25 14:55:50 +05:30
Georgi Kodinov
1a292ee535 merged bug 31060 to 5.1-bugteam 2009-02-25 11:09:41 +02:00
Alexey Kopytov
647ad03c1c Automerge. 2009-02-25 10:50:32 +02:00
Alexey Kopytov
2e4309c139 Automerge. 2009-02-25 10:49:02 +02:00
Alexey Kopytov
5cf0d591eb Automerge. 2009-02-25 10:48:05 +02:00
Alexey Kopytov
aa9b46c767 Automerge. 2009-02-25 10:39:28 +02:00
Alexey Kopytov
d8130a35fb Fixed a build failure on Ubuntu 8.10 introduced by the patch
for bug #15936.

On some platforms fenv.h may #undef the min/max macros
defined in my_global.h.

Fixed by moving the #include directive for fenv.h from
mysqld.cc to my_global.h before definitions for min/max.
2009-02-25 10:36:11 +02:00
Patrick Crews
592a05fdb5 merge. 2009-02-25 10:16:29 +02:00
Anurag Shekhar
102dd4933c Bug #38103 myisamchk: --help output incomplete
In the output message for --help entry for -H --HELP was missing.
Added this entry while printing the help text.
2009-02-24 20:44:47 +05:30
Andrei Elkin
191ccc236e merging bug#37313fixes from 5.0-bt to 5.1-bt 2009-02-24 16:59:46 +02:00
Andrei Elkin
da7aa6bc9f merging from 5.0-bt rep to a local branch 2009-02-24 16:35:45 +02:00
Patrick Crews
64c32d5a09 Bug#40178: Test main.completion_type_func does not clean up / needs to be rewritten
Revised the test to include a test of completion_type = 1 as well as making the test more readable / worthwhile
Removed the master.opt file as it was redundant / unnecessary.
2009-02-24 16:20:00 +02:00
Andrei Elkin
162eca37dd fixing compilation warning and adding flush logs to test of bug#37313 2009-02-24 16:17:34 +02:00
Georgi Kodinov
13ec76b0ad Bug #31060: MySQL CLI parser bug 2
There was a problem when a DELIMITER COMMAND is not the first 
command on the line. I this case an extra line feed was added
to the glob buffer and this was causing subsequent attempts 
to enter this delimiter to fail.
Fixed by not adding a new line to the glob buffer if the 
command being added is a DELIMITER
2009-02-24 15:06:28 +02:00
Georgi Kodinov
5cc8c6f380 Bug #31060: MySQL CLI parser bug 2
There was a problem when a DELIMITER COMMAND is not the first 
command on the line. I this case an extra line feed was added
to the glob buffer and this was causing subsequent attempts 
to enter this delimiter to fail.
Fixed by not adding a new line to the glob buffer if the 
command being added is a DELIMITER
2009-02-24 15:06:28 +02:00
Alexey Botchkov
5beaba1d5b merging. 2009-02-24 15:34:00 +04:00
Alexey Botchkov
d5de8c76e6 merging. 2009-02-24 15:29:49 +04:00
Alexey Botchkov
c71004dcbb merging. 2009-02-24 15:22:37 +04:00
Alexey Botchkov
95f5d6a2cd merging. 2009-02-24 15:17:50 +04:00
Chad MILLER
c0f952c105 Null-merge 39370 fix. Unnecessary in 5.1. 2009-02-24 12:33:51 +02:00
Chad MILLER
8d5286d273 Merge bug 39370 fix from bug tree. 2009-02-24 12:31:42 +02:00
Chad MILLER
db076da82a Bug#39370: wrong output for error code 153
Add all HA error numbers and descriptions to perror.

Add reminder to header.

This is already fixed in smarter ways in future codebases, and this 
codebase is unlikely to change, since new development is forbidden
here.
2009-02-24 12:05:37 +02:00
Davi Arnaut
1959c4966e Bug#41110: crash with handler command when used concurrently with alter table
Bug#41112: crash in mysql_ha_close_table/get_lock_data with alter table

The problem is that the server wasn't handling robustly failures
to re-open a table during a HANDLER .. READ statement. If the
table needed to be re-opened due to it's storage engine being
altered to one that doesn't support HANDLER, a reference (dangling
pointer) to a closed table could be left in place and accessed in
later attempts to fetch from the table using the handler. Also,
if the server failed to set a error message if the re-open
failed. These problems could lead to server crashes or hangs.

The solution is to remove any references to a closed table and
to set a error if reopening a table during a HANDLER .. READ
statement fails.
2009-02-24 10:49:18 +01:00
Davi Arnaut
322a5a39ad Bug#41110: crash with handler command when used concurrently with alter table
Bug#41112: crash in mysql_ha_close_table/get_lock_data with alter table

The problem is that the server wasn't handling robustly failures
to re-open a table during a HANDLER .. READ statement. If the
table needed to be re-opened due to it's storage engine being
altered to one that doesn't support HANDLER, a reference (dangling
pointer) to a closed table could be left in place and accessed in
later attempts to fetch from the table using the handler. Also,
if the server failed to set a error message if the re-open
failed. These problems could lead to server crashes or hangs.

The solution is to remove any references to a closed table and
to set a error if reopening a table during a HANDLER .. READ
statement fails.

There is no test case in this change set as the test depends on
a testing feature only available on 5.1 and later.
2009-02-24 10:15:21 +01:00
Tatiana A. Nurnberg
d16c7dd182 automerge 2009-02-24 09:33:04 +01:00
Tatiana A. Nurnberg
1fbfd317d6 automerge 2009-02-24 09:31:42 +01:00
Tatiana A. Nurnberg
963167e0ff automerge 2009-02-24 09:07:40 +01:00
Tatiana A. Nurnberg
fde4ef6e0a automerge 2009-02-24 09:06:02 +01:00
Tatiana A. Nurnberg
5ee7e1b716 automerge 2009-02-24 08:19:45 +01:00
Tatiana A. Nurnberg
93dac5c581 automerge 2009-02-24 08:06:18 +01:00
Tatiana A. Nurnberg
c1e0d67002 automerge 2009-02-24 08:05:30 +01:00
Alexey Kopytov
52ed110b75 Manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam. 2009-02-23 17:16:46 +02:00
Alexey Kopytov
c56c15aabb Automerge. 2009-02-23 14:54:43 +02:00
Alexey Kopytov
1ba7c35e5c Automerge. 2009-02-23 14:53:51 +02:00
Alexey Kopytov
2247fb7cd1 Manual merge to 5.1. 2009-02-23 14:42:31 +02:00
Alexey Kopytov
cebaf077d2 Fix for bug #15936: "round" differs on Windows to Unix
Both of our own implementations of rint(3) were inconsistent with the
most common behavior of rint() on those platforms that have it: round
to nearest, break ties by rounding to nearest even.

Fixed by leaving just one implementation of rint() in our source tree,
and changing its behavior to match the most common native
implementations on other platforms.
2009-02-23 14:28:26 +02:00
Tatiana A. Nurnberg
e30fa864a4 auto-merge 2009-02-23 13:14:17 +01:00
Tatiana A. Nurnberg
36d83ee251 auto-merge 2009-02-23 12:53:04 +01:00
Anurag Shekhar
84a72d4593 merging with changes in bugteam branch. 2009-02-23 15:39:08 +05:30
Leonard Zhou
4c0d3866ca merge 2009-02-23 16:49:22 +08:00
Leonard Zhou
5c5ace67d1 merge 2009-02-23 16:29:39 +08:00
Davi Arnaut
cdb052a501 Post-merge fix: test depends on feature not available under embedded. 2009-02-23 09:03:31 +01:00
Leonard Zhou
8a6084816a Bug#40013 mixed replication: row based format could lead to stale tmp tables on the
slave.

In mixed mode, if we create a temporary table and do some update which switch to ROW format,
the format will keep in ROW format until the session ends or the table is dropped explicitly. 
When the session ends, the temp table is dropped automaticly at cleanup time.
but it checks only current binlog format and so skip insertion of DROP TABLE instructions into binlog.
So the temp table can't be dropped correctly at slave.

Our solution is that when closing temp tables at cleanup time we check both binlog format and binlog mode,
and we could write DROP TABLE instructions into binlog if current binlog format is ROW but in MIX mode.
2009-02-23 11:26:38 +08:00
Alfranio Correia
0d3b85b9ff Post-fix for BUG#38174. 2009-02-22 13:40:52 +00:00
Alfranio Correia
4447ce614f BUG#38174 secure-file-priv breaks LOAD DATA INFILE replication in statement mode
If secure-file-priv was set on slave, it became unable to execute
LOAD DATA INFILE statements sent from master using mixed or
statement-based replication.
                  
This patch fixes the issue by ignoring this security restriction
and checking if the files are created and read by the slave in the
--slave-load-tmpdir while executing the SQL Thread.
2009-02-21 09:36:07 +00:00
Mattias Jonsson
b3180fe812 merge 2009-02-20 17:02:02 +01:00