Commit graph

57,313 commits

Author SHA1 Message Date
Matthias Leich
0b2f4c56c6 Merge 5.0 -> 5.1 of fix for the bugs 43015 and 43065 2009-03-23 17:08:48 +01:00
Matthias Leich
5eb0b4819c 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
9a561879c5 remove compiler warnings 2009-03-23 16:51:39 +04:00
Georgi Kodinov
596a9dbdfb Disabled the failing test case until bug #43440 is resolved 2009-03-23 11:38:54 +02:00
Georgi Kodinov
84557d4423 merged 5.1-main -> 5.1-bugteam 2009-03-23 11:36:39 +02:00
Tatiana A. Nurnberg
aeb9747a95 auto-merge 2009-03-23 05:21:45 +01:00
Tatiana A. Nurnberg
7c63b4ba5a auto-merge 2009-03-23 05:21:02 +01:00
Tatiana A. Nurnberg
2e4ac39640 auto-merge 2009-03-23 05:09:51 +01:00
Tatiana A. Nurnberg
4093dcfb03 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.


client/mysql.cc:
  Handle empty result-sets gracefully, as opposed
  to just result sets with n>0 items that may themselves
  be empty.
2009-03-23 05:08:32 +01:00
Alfranio Correia
c461c1b0ca Post-fix BUG#42861. 2009-03-23 01:07:25 +00:00
Alfranio Correia
ef0d5cc5f2 auto-merge 5.1-bugteam (local) --> 5.1-bugteam 2009-03-22 19:46:57 +00:00
Tatiana A. Nurnberg
a9c1df9398 auto-merge 2009-03-20 19:10:12 +01:00
Tatiana A. Nurnberg
bd1e650272 auto-merge 2009-03-20 19:09:00 +01:00
Horst Hunger
2aff261018 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
0bab3f2ffd Fixed the failing tests. Addendum to the fix for bug #22504. 2009-03-20 16:49:43 +02:00
Georgi Kodinov
e8cc09dc8d fixed compilation warnings. addendum to the fix for bug 29125 2009-03-20 16:27:53 +02:00
Georgi Kodinov
26adc3cdc7 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
07d3da54fc reverting a bogus fix into 5.1-bugteam 2009-03-20 13:18:29 +02:00
Satya B
295e876718 Fix for BUG#41330 -Myisam table open count set to zero before index blocks
are written.
      
When we have a myisam table with DELAY_KEY_WRITE option, index updates
are not applied until the flush tables command is issued or until the
server is shutdown. If server gets killed before the index updates are 
written to disk, the index file is corrupted as expected but the table 
is not marked as crashed. So when we start server with myisam-recover,
table is not repaired leaving the table unusable.
      
The problem is when we try to write the index updates to index file,
we decrement the open_count even before the flushing the keys to index
file.
      
Fixed by moving the decrement operation after flushing the keys to the
index file. So we always have non zero open count if the flush table
operation is killed and when the server is started with mysiam-recover
option, it marks the table as crashed and repairs it.
      
Note: No testcase for added as we need to kill the server and start the 
      server with different set of options and other non trivial
      operations involved.

myisam/mi_close.c:
  Decrement open count after flushing the key blocks to the
  key file. If the server(with DELAY_KEY_WRITE option) is
  killed before flush_key_blocks operation, we will have non
  zero open count and the table can be repaired when server is
  started with --myisam-recover option.
2009-03-20 14:48:14 +05:30
Narayanan V
de750af17d merging with mysql-5.0-bugteam 2009-03-20 11:42:55 +05:30
Davi Arnaut
27e3214b49 Bug#43461: invalid comparison with string literal in default.c
Don't compare string literals as it results in unspecified behavior.

mysys/default.c:
  Test for a empty string.
2009-03-19 17:20:15 -03:00
Chad MILLER
738d964e67 Merge contributed automake changes, and 5.1 upstream. 2009-03-19 16:18:10 -04:00
Joerg Bruehe
fde56b5a86 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
6f572a8eaf 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.

client/mysql.cc:
  Use dynamic rather than static buffer for server
  information. If we can get both version and comment,
  concat them and use that. Otherwise, try to use just
  version. If that fails too, return empty string so
  overly trusting callers do not crash. Release memory
  as needed.
2009-03-19 18:42:43 +01:00
Joerg Bruehe
b7c50e7676 Set the version number for the SP build. 2009-03-19 18:19:23 +01:00
Joerg Bruehe
f50e3e2ee2 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).

configure.in:
  Skip pthread_setschedprio check on i5/OS.
2009-03-19 18:09:47 +01:00
Joerg Bruehe
8a07ce8b96 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.


mysql-test/r/func_misc.result:
  Fix for bug#42014: Crash, name_const with coll
    - test result.
mysql-test/t/func_misc.test:
  Fix for bug#42014: Crash, name_const with coll
    - test case.
sql/item.cc:
  Fix for bug#42014: Crash, name_const with coll
    - in case of NAME_CONST('name', 'value' COLLATE collation)
  Item_name_const::type() returns type of 'value' argument 
  to avoid wrong type casting of the Item_name_const items.
2009-03-19 17:37:58 +01:00
unknown
150b0850b3 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
unknown
d28b1cfb36 Merge from mysql-5.0.79-release 2009-03-19 16:22:14 +01:00
Sergey Petrunia
282930dc80 Merge 2009-03-19 17:43:01 +03:00
Ignacio Galarza
868db2f21d auto-merge 2009-03-19 09:59:10 -04:00
Ignacio Galarza
e8c13e6a54 auto-merge 2009-03-19 09:58:56 -04:00
Chad MILLER
1f34139544 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
26211b5ccd Bug#43329 merge from 5.0 GCA-branch 2009-03-19 14:52:35 +01:00
Bernt M. Johnsen
3525893a8d Bug#43329 merge from 5.1 GCA branch 2009-03-19 14:48:57 +01:00
Ignacio Galarza
675c3ce2bb auto-merge 2009-03-19 09:44:58 -04:00
Ignacio Galarza
1aefa8029f auto-merge 2009-03-19 09:42:36 -04:00
Chad MILLER
9bdcb6ba6e Copy include/config.h to include/my_config.h at configure-time. Also,
continue to update it at make-time.

One shouldn't need to run "make" on server source to get the stuff we say
plugins should use.
2009-03-19 09:37:30 -04:00
Sergey Petrunia
64ed42d09e Merge @@optimizer_switch no_xxx -> xxx=off change to 6.0 2009-03-19 15:22:08 +03:00
Alexander Nozdrin
eb5ef51327 Fix default.conf 2009-03-19 15:19:53 +03:00
Magnus Svensson
776bb04abf Merge 2009-03-19 12:42:55 +01:00
Horst Hunger
fe1b3b941c due to merge. 2009-03-19 12:30:25 +01:00
Horst Hunger
667a004c53 Reviewed patch for Bug#39862. 2009-03-19 12:21:38 +01:00
Joerg Bruehe
1c042ff7ba This is a backport of a fix applied in 5.1.32 into 5.1.31sp1
The original fix was done by Jonathan Perkin and committed by Georgi Kodinov
on 2009-02-10.
The same day, Georgi added a compilation fix which is already included here.


Original comment:
  Merge libedit 2.11 and related files,
  based on NetBSD CVS as of 2009/02/06 20:09:00.
2009-03-19 12:08:50 +01:00
Staale Smedseng
6725f3efd6 Merge from 5.0-bugteam 2009-03-19 11:44:57 +01:00
Staale Smedseng
28f4090bda Bug #42502 huge memory leak possible with timezone
functions
      
Unknown timezone specifications are properly rejected
by the server, but are copied into tz_storage before
rejection, and hence is retained until end of server 
life. With sufficiently large bogus timezone specs, 
it is easy to exhaust system memory.
      
Allocation of memory for a copy of the timezone
name is delayed until after verification of validity,
at the cost of a memcpy of the timezone info. This 
only happens once, future lookups will hit the cached
structure.
2009-03-19 11:27:45 +01:00
Bernt M. Johnsen
f8c7da537d Bug#43329 Prepared for push on 5.1 2009-03-19 11:18:52 +01:00
Alexey Kopytov
169bf74540 Automerge. 2009-03-19 13:09:34 +03:00
Alexey Kopytov
35f9f89602 Automerge. 2009-03-19 13:08:15 +03:00
Alexey Kopytov
a4f59d4a4c Automerge. 2009-03-19 13:07:30 +03:00