Commit graph

56981 commits

Author SHA1 Message Date
Alexey Kopytov
b3901af145 Manuel merge. 2009-03-24 23:48:31 +03:00
Alexey Kopytov
b071b660e9 Fix for bug #43801: mysql.test takes too long, fails due to
expired timeout on debx86-b in PB 

Moved the resource-intensive test case for bug #41486 into 
a separate test file to reduce execution time for mysql.test.
2009-03-24 23:44:38 +03:00
Luis Soares
6dff801284 BUG#39701: Mixed binlog format does not switch to row mode on
LOAD_FILE
            
LOAD_FILE is not safe to replicate in STATEMENT mode, because it
depends on a file (which is loaded on master and may not exist in
slave(s)). This leads to scenarios on which the slave replicates the
statement with 'load_file' and it will try to load the file from local
file system. Given that the file may not exist in the slave filesystem
the operation will not succeed (probably returning NULL), causing
master and slave(s) to diverge. However, when using MIXED mode
replication, this can be made to work, if the statement including
LOAD_FILE is marked as unsafe, triggering a switch to ROW mode,
meaning that the contents of the file are written to binlog as row
events. Consequently, the contents from the file in the master will
reach the slave via the binlog.
           
This patch addresses this bug by marking the load_file function as
unsafe. When in mixed mode and when LOAD_FILE is issued, there will be
a switch to row mode. Furthermore, when in statement mode, the
LOAD_FILE will raise a warning that the statement is unsafe in that
mode.
2009-03-24 18:27:33 +00:00
Georgi Kodinov
7b7d5b5b43 Fixed initialization order warining. 2009-03-24 16:52:35 +02:00
Georgi Kodinov
706a0a39ed merged 5.0-bugteam -> 5.1-bugteam 2009-03-24 15:58:52 +02:00
Leonard Zhou
d0cb03b860 Bug#43440 rpl.rpl_temp_table_mix_row fails sporadicly
The problem is that after disconnect, the DOPR TEMPORARY TABLE event didn't been
written into binlog. So after syncing with slave, the TEMPORARY table on slave 
is not removed.
      
Waiting DROP TEMPORARY TABLE event to be written into binlog before sync slave with
master.
2009-03-24 16:55:03 +08:00
Alexey Kopytov
73cb9b6e04 Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can
produce incorrect results for ROUND() 

Added a workaround and a configure check to test whether 
isinf() is affected by the GCC bug #39228. 
       
Since no code in MySQL server is currently affected by that 
bug, the patch is actually a safeguard for possible future 
code modifications. No test cases or changelog entries are 
needed.
2009-03-24 11:26:22 +03:00
Leonard Zhou
84a63525d5 Merge 2009-03-24 15:29:04 +08:00
Leonard Zhou
8ac45fb09d Merge 2009-03-24 15:19:46 +08:00
Horst Hunger
fcf6712e21 Merge to be able to push. 2009-03-24 11:48:38 +01:00
Sergey Glukhov
40138ba72a compiler warning fix 2009-03-24 13:02:01 +04:00
Leonard Zhou
bcf70ef6a0 Merge 2009-03-24 15:10:40 +08:00
Leonard Zhou
56184684f4 Merge 2009-03-24 14:24:27 +08:00
Leonard Zhou
97c6e3f88b BUG#41719 delayed INSERT into timestamp col needs set time_zone for concurrent binlogging
When do 'insert delayed' operation, the time_zone info doesn't be keeped in the row info.
So when we do insert sometime later, time_zone didn't write into binlog.
This will cause wrong result for timestamp column in slave.

Our solution is that adding time_zone info with the delayed-row and
restoring time_zone from row-info when execute that row in the furture by another thread.
So we can write correct time_zone info into binlog and got correct result in slave.
2009-03-24 08:45:05 +08:00
Matthias Leich
9c515e3d5c Merge of fixes into actual tree 2009-03-23 21:19:41 +01:00
Matthias Leich
55ee0f440f Merge 5.0 -> 5.1 of fix for the bugs 43015 and 43065 2009-03-23 17:08:48 +01:00
Matthias Leich
3e89ac0120 Fix for Bug#43015 and Bug#43065
Details for Bug#43015 main.lock_multi: Weak code (sleeps etc.)
   -------------------------------------------------------------
   - The fix for bug 42003 already removed a lot of the weaknesses mentioned.
   - Tests showed that there are unfortunately no improvements of this tests
     in MySQL 5.1 which could be ported back to 5.0.
   - Remove a superfluous "--sleep 1" around line 195

   Details for Bug#43065 main.lock_multi: This test is too big if the disk is slow
   -------------------------------------------------------------------------------
   - move the subtests for the bugs 38499 and 36691 into separate scripts
   - runtime under excessive parallel I/O load after applying the fix
     lock_multi           [ pass ]          22887
     lock_multi_bug38499  [ pass ]         536926
     lock_multi_bug38691  [ pass ]         258498
2009-03-23 15:22:31 +01:00
Sergey Glukhov
1cff5b9c53 remove compiler warnings 2009-03-23 16:51:39 +04:00
Georgi Kodinov
30f1fc229e Disabled the failing test case until bug #43440 is resolved 2009-03-23 11:38:54 +02:00
Georgi Kodinov
f7cfb8ea0e merged 5.1-main -> 5.1-bugteam 2009-03-23 11:36:39 +02:00
Tatiana A. Nurnberg
8aff42f6a0 auto-merge 2009-03-23 05:21:45 +01:00
Tatiana A. Nurnberg
06cb0ec482 auto-merge 2009-03-23 05:21:02 +01:00
Tatiana A. Nurnberg
deb566d6b3 auto-merge 2009-03-23 05:09:51 +01:00
Tatiana A. Nurnberg
e5a599bd73 Bug#43254: SQL_SELECT_LIMIT=0 crashes command line client
When asking what database is selected, client expected
to *always* get an answer from the server.

We now handle failure more gracefully.

See comments in ticket for a discussion of what happens,
and how things interlock.
2009-03-23 05:08:32 +01:00
Alfranio Correia
b580f3b60b Post-fix BUG#42861. 2009-03-23 01:07:25 +00:00
Alfranio Correia
0a8f0d280c auto-merge 5.1-bugteam (local) --> 5.1-bugteam 2009-03-22 19:46:57 +00:00
Tatiana A. Nurnberg
43c1659946 auto-merge 2009-03-20 19:10:12 +01:00
Tatiana A. Nurnberg
df1a9f6c0b auto-merge 2009-03-20 19:09:00 +01:00
Horst Hunger
004662b194 Reviewed fix for bug#37962 also including the revised result files for failing system variable tests. 2009-03-20 18:11:22 +01:00
Georgi Kodinov
724d3e8a06 Fixed the failing tests. Addendum to the fix for bug #22504. 2009-03-20 16:49:43 +02:00
Georgi Kodinov
ef4ab5cfaa fixed compilation warnings. addendum to the fix for bug 29125 2009-03-20 16:27:53 +02:00
Georgi Kodinov
4a3c0d800a Fixed a prototype to match the actual function signature (addendum to the
fix for 29125).
2009-03-20 13:35:00 +02:00
Georgi Kodinov
b71a73c7e2 reverting a bogus fix into 5.1-bugteam 2009-03-20 13:18:29 +02:00
Narayanan V
b466a93b8a merging with mysql-5.0-bugteam 2009-03-20 11:42:55 +05:30
Davi Arnaut
2417701e46 Bug#43461: invalid comparison with string literal in default.c
Don't compare string literals as it results in unspecified behavior.
2009-03-19 17:20:15 -03:00
Chad MILLER
0c16305409 Merge contributed automake changes, and 5.1 upstream. 2009-03-19 16:18:10 -04:00
Joerg Bruehe
ac91cb1f50 Fix "libedit" to use the proper symbols when checking
for Sun or HP (no <sys/ttydefaults.h> there),
and include AIX in that exception list.

Originally done by Kent Boortz for 5.1.32 on 2009-02-11 + 12
and now backported into 5.1.31sp1
2009-03-19 21:06:15 +01:00
Tatiana A. Nurnberg
dc1e9bfb56 Bug#43153: Version comment is too long
mysql-client used static buffer to concatenate server-
version and version_comment. Sufficiently long comments
could get cut off. This was harmless, but looked daft.

Now using a dynamic buffer instead.
2009-03-19 18:42:43 +01:00
Joerg Bruehe
e8855a42ce Set the version number for the SP build. 2009-03-19 18:19:23 +01:00
Joerg Bruehe
dc9f15accc This is a backport from 5.1.32 into 5.1.31sp1.
The original fix was done by Davi Arnaut on 2009-02-03
All comments are copied from the original fix:


Bug#42524: Function pthread_setschedprio() is defined but seems broken on i5/OS PASE

The problem is that MySQL use of pthread_setschedprio is not
supported i5/OS and the default system behavior for unsupported
calls is to emit a SIGILL signal which causes the server to
abort.

The solution is to treat the pthread_setschedprio as inexistent
when compiling binaries to i5/OS. This also does not invalidate
the fix for bug 38477 as the only supported dispatch class is
SCHED_OTHER (which is passed to pthread_setschedparam).
2009-03-19 18:09:47 +01:00
Joerg Bruehe
85217cb303 This is a backport from 5.1.32 into 5.1.31sp1.
The original fix was done by Ramil Kalimullin on 2009-02-05
All comments are copied from the original fix:


Fix for bug#42014: Crash, name_const with collate

Problem: some queries using NAME_CONST(.. COLLATE ...)
lead to server crash due to failed type cast.

Fix: return the underlying item's type in case of
NAME_CONST(.. COLLATE ...) to avoid wrong casting.
2009-03-19 17:37:58 +01:00
kent.boortz@sun.com
677b00faf6 cmd-line-utils/libedit/readline/readline.h
- Header <sys/ttydefaults.h> missing or not usable on QNX and OpenServer 6

include/my_global.h
 - Moved down definition of function rint(), as for some platforms (in
   this case Netware) 'longlong' is not defined until later in
   "my_global.h"
2009-03-19 16:40:54 +01:00
kent.boortz@sun.com
860d9e9d7e Merge from mysql-5.0.79-release 2009-03-19 16:22:14 +01:00
Sergey Petrunia
ea31e7f828 Merge 2009-03-19 17:43:01 +03:00
Ignacio Galarza
22b919cc50 auto-merge 2009-03-19 09:59:10 -04:00
Ignacio Galarza
5d13d4f34e auto-merge 2009-03-19 09:58:56 -04:00
Chad MILLER
b4656bd714 Merge bugteam and contributed two patches from
Antony Dovgal <tony @ daylessday.org> .  SCA signed and faxed to
tel:+1-408-715-2540.  Patches tweaked by Chad.
2009-03-19 09:53:54 -04:00
Bernt M. Johnsen
39ceb7f6ef Bug#43329 merge from 5.0 GCA-branch 2009-03-19 14:52:35 +01:00
Bernt M. Johnsen
50a38b7407 Bug#43329 merge from 5.1 GCA branch 2009-03-19 14:48:57 +01:00
Ignacio Galarza
e82390130e auto-merge 2009-03-19 09:44:58 -04:00