Commit graph

23591 commits

Author SHA1 Message Date
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
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
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
Mattias Jonsson
a316631af4 Backport of patch for bug#40003 from 6.0 to 5.1,
related to the backport of the patch for bug#38719
2009-02-20 16:56:32 +01:00
Patrick Crews
eecf716a83 automerge 2009-02-20 08:40:28 -05:00
Patrick Crews
8c0befa291 auto merge 2009-02-20 08:37:07 -05:00
Andrei Elkin
c02752a005 Bug #37313 BINLOG Contains Incorrect server id
Signed integer format specifier forced to print the binlog header with server_id
negative if the unsigned value sets the sign-bit ON.
  
Fixed with correcting the specifier to correspond to typeof(server_id) == ulong.
2009-02-20 13:55:43 +02:00
Mattias Jonsson
44c8379e55 merge of updated 51-bugteam before pushing... 2009-02-20 11:45:57 +01:00
Mattias Jonsson
c93559c9d6 merge into an updated 5.1-bugteam. 2009-02-20 11:21:45 +01:00
Georgi Kodinov
5cc766b03b auto merge 2009-02-20 11:57:33 +02:00
Georgi Kodinov
429e565f82 merged 5.0-bugteam -> 5.1-bugteam 2009-02-20 11:50:50 +02:00
Mattias Jonsson
26c4ef0aae pre push test result update for bug#38719
Updated with the correct error message.
2009-02-20 10:27:32 +01:00
Georgi Kodinov
39dc3623b3 Bug #42419: test suite fix
Moved the test case for the bug into a separate file (and restored the 
original innodb_mysql test setup).
Used the new wait_show_condition test macro to avoid the usage of sleep
2009-02-20 11:12:06 +02:00
Patrick Crews
783cae1831 merge 5.0 -> 5.1
These are only 5.0's fixes being merged.
5.1 and 6.0 Unix-removals will occur in different patches.
2009-02-19 18:24:25 -05:00
Patrick Crews
ac46e34435 Bug#38831: 11 test cases fail on Windows due to missing commands
Re-enabling mysqlbinlog.test on Windows - removed the use of grep/sed
2009-02-19 16:35:29 -05:00
Davi Arnaut
a2e4449bfc Bug#41098: Query Cache returns wrong result with concurrent insert
The problem is that select queries executed concurrently with
a concurrent insert on a MyISAM table could be cached if the
select started after the query cache invalidation but before
the unlock of tables performed by the concurrent insert. This
race could happen because the concurrent insert was failing
to prevent cache of select queries happening at the same time.

The solution is to add a 'uncacheable' status flag to signal
that a concurrent insert is being performed on the table and
that queries executing at the same time shouldn't cache the
results.
2009-02-19 18:09:35 -03:00
Serge Kozlov
123549e7e8 merge 5.1 2009-02-19 23:49:45 +03:00
Patrick Crews
cc628c61fb Bug#38831: 11 test cases fail on Windows due to missing commands
Replaced Unix calls with mysql-test-run's built-in functions / SQL manipulation where possible.
Replaced error codes with error names as well.
Disabled two tests on Windows due to more complex Unix command usage
See Bug#41307, Bug#41308
2009-02-19 15:37:40 -05:00
Serge Kozlov
a64cede983 Bug#41423.
1. Constant values of binlog positions replaced by seeking them in binlog/relay log.
2. Updated result file
2009-02-19 23:29:12 +03:00
Georgi Kodinov
40619ea311 merged 5.0-bugteam -> 5.1-bugteam 2009-02-19 20:30:05 +02:00
Tatiana A. Nurnberg
1d85ad238b manual merge 2009-02-19 18:22:28 +01:00
Tatiana A. Nurnberg
f218f9f278 Bug#33550: mysqldump 4.0 compatibility broken
mysqldump included character_set_client magic
that is unknown before 4.1 even when asked for
an appropriate compatibility mode.

In compatibility (3.23, 4.0) mode, we do not
output charset statements (not even in a
"comment conditional"), nor do we do magic on
the server, even if the server is sufficient
new (4.1+). Table-names will be output converted
to the charset requested by mysqldump; if such
a conversion is not possible (Ivrit -> Latin),
mysqldump will fail.
2009-02-19 17:33:28 +01:00
Georgi Kodinov
759edca6ac merged bug 42419 to 5.0-bugteam 2009-02-19 18:26:19 +02:00
Georgi Kodinov
b2c161c192 Bug #42419: Server crash with "Pure virtual method called" on two concurrent
connections
The problem is that tables can enter open table cache for a thread without 
being properly cleaned up. This can happen if make_join_statistics() fails 
to read a const table because of e.g. a deadlock. It does set a member of 
TABLE structure to a value it allocates, but doesn't clean-up this setting 
on error nor does it set the rest of the members in JOIN to allow for 
automatic cleanup.
As a result when such an error occurs and the next statement depends re-uses 
the table from the open tables cache it will get it with this 
TABLE::reginfo.join_tab pointing to a memory area that's freed.
Fixed by making sure make_join_statistics() cleans up TABLE::reginfo.join_tab 
on error.
2009-02-19 17:30:03 +02:00
Sergey Glukhov
afc1c8a5af automerge 2009-02-19 18:52:49 +04:00
Sergey Glukhov
bca6863ac7 5.0-bugteam->5.1-bugteam merge 2009-02-19 17:59:00 +04:00
Sergey Glukhov
6a9de01a95 Bug#37601 Cast Is Not Done On Row Comparison
In case of ROW item each compared pair does not
check if argumet collations can be aggregated and
thus appropiriate item conversion does not happen.
The fix is to add the check and convertion for ROW
pairs.
2009-02-19 17:20:44 +04:00
Mattias Jonsson
d8cbc5247c Backport of test results for Bug#38719 from 6.0 to 5.1
post push fix, Bug#38719, additional test cases updated
2009-02-18 22:35:28 +01:00
Mattias Jonsson
e2cf7f14a0 Backport of bug#38719 from 6.0 to 5.1
handler::get_dup_key used the called handler for the
info call, but used table->file handler for errkey.
Fixed by using table->file->info instead.
2009-02-18 21:29:30 +01:00
Mattias Jonsson
5b15e3de83 Backport of bug#36001 from 6.0 to 5.1 2009-02-18 21:22:56 +01:00
Mattias Jonsson
d8e34e554c Bug#36001: Partitions: spelling and using some error messages
Backport from 6.0

Changed error message to show that it is partitioning
that does not support foreign keys yet.

Changed spelling from British english to American english.
2009-02-18 21:10:19 +01:00
Sergey Glukhov
ad0e657db4 5.0->bugteam->5.1-bugteam merge 2009-02-18 16:09:46 +04:00
Vladislav Vaintroub
df733e5f12 merge 2009-02-18 10:31:53 +01:00
Sergey Glukhov
7acaece2ba Bug#25830 SHOW TABLE STATUS behaves differently depending on table name(for 5.0 only)
replace wild_case_compare with my_wildcmp which is multibyte safe function
2009-02-17 18:22:48 +04:00
Matthias Leich
fc43a137d4 Merge of fix for Bug 42836 into GCA tree 2009-02-16 20:43:34 +01:00
Andrei Elkin
19a7e36679 commenting windows disable for rpl_cross_version to relate to Bug #42879 2009-02-16 14:51:39 +02:00
Davi Arnaut
d5f92fec29 Bug#41077: Warning contains wrong future version
Substitute all references of MySQL version "5.2" to "6.0" in
deprecation warning messages.Deprecated constructs are being
removed in the 6.0 tree.
2009-02-16 08:38:15 -03:00
Andrei Elkin
5101180304 rpl_cross_version.test is disable for win till a proper fixing bug#42451 2009-02-16 10:49:51 +02:00
Alexey Kopytov
5105fb34a0 Take additional precision into account 2009-02-15 14:11:50 +03:00
Alexey Kopytov
f0be8af10e Automerge. 2009-02-15 12:47:04 +03:00
Alexey Kopytov
b615d8bcb4 Fixed PB failures on IA64 hosts introduced by the patch for bug #21205. 2009-02-15 12:26:08 +03:00
Patrick Crews
b7a5717d19 automerge 2009-02-14 17:52:45 -05:00
Alexey Kopytov
5ecbccf9c9 Automerge. 2009-02-14 20:14:10 +03:00