Commit graph

56610 commits

Author SHA1 Message Date
Magnus Svensson
7274b63644 Merge 2009-02-13 14:47:01 +01:00
Matthias Leich
2a162ef3b1 Merge actual tree -> local GCA tree, no conflicts 2009-02-13 13:55:29 +01:00
Staale Smedseng
1912ad75ab A fix for Bug#41528 2009-02-13 13:35:38 +01:00
Matthias Leich
1677de6ddd Merge actual tree -> local GCA tree, no conflicts 2009-02-13 13:06:50 +01:00
Anurag Shekhar
c55d8297d8 Bug#40321 ha_myisam::info could update rec_per_key incorrectly
MyISAM did copy of key statistics incorrectly, which may cause
server crash or incorrect cardinality values. This may happen only on
platforms where size of long differs from size of pointer.
      
      To determine number of bytes to be copied from array of ulong,
MyISAM mistakenly used sizoef(pointer) instead of sizeof(ulong).
2009-02-13 17:11:54 +05:30
Davi Arnaut
4d5668d93b Backport from 6.0 fix for Bug#38249
2722 Konstantin Osipov	2008-10-03
Fix Bug#38249 innodb_log_arch_dir still in support files
Remove a non-supported variable from cnf file templates.
2009-02-12 20:32:37 -02:00
Magnus Svensson
07fad74238 Bug#42797 mtr.pl - temporary directory are deleted when child exit's
- Since we are only using the auto cleanup in one place of mtr.pl today, disable the
autocleanup and write our own END handler that clean up the tmpdir only when the process
that created it exits.
2009-02-12 17:36:58 +01:00
Vladislav Vaintroub
b7393ba5ce Bug#42788 lib\My\CoreDump.pm needs to be ported for Windows.
- output callstacks from crash using cdb debugger which is part 
of "Debugging Tools for Windows". Output  other interesting 
information - function parameters, possibly source code fragment
and other goodies of  "!analyze" cdb extension.
2009-02-12 17:13:56 +01:00
Georgi Kodinov
e23292155a merged additional fix for bug 33813 to 5.1-bugteam 2009-02-12 17:30:38 +02:00
Georgi Kodinov
ecae2a57e1 merged 5.0-bugteam to a working tree 2009-02-12 16:39:33 +02:00
Georgi Kodinov
074dade352 Bug #33813: Schema names are case-sensitive in DROP FUNCTION
Additional fix:
 1. Revert the unification of DROP FUNCTION
and DROP PROCEDURE, because DROP FUNCTION can be used to
drop UDFs (that have a non-qualified name and don't require
database name to be present and valid).
 2. Fixed the case sensitivity problem by adding a call to 
check_db_name() (similar to the sp_name production).
2009-02-12 16:36:43 +02:00
Sergey Vojtovich
4c6692b707 Merge 5.1-bugteam -> 5.1-bugteam (local). 2009-02-12 14:25:12 +04:00
V Narayanan
d325957f88 Bug#40675 MySQL 5.1 crash with index merge algorithm and Merge tables
A Query in the MyISAM merge table was crashing 
if the index merge algorithm was being used

Index Merge optimization requires the reading of 
multiple indexes at the same time. Reading multiple 
indexes at once with current SE API means that we 
need to have handler instance for each to-be-read 
index. This is done by creating clones of the handlers 
instances. The clone internally does a open of the handler.

The open for a MERGE engine is handled in the following 
phases

1) open parent table
2) generate list of underlying
   table
3) attach underlying tables

But the current implementation does only the first 
phase (i.e.) open parent table.

The current patch fixes this at the MERGE engine level, 
by handling the clone operation within the MERGE engine 
rather than in the storage engine API. It opens and 
attaches the MyISAM tables on the MyISAM storage engine 
interface directly within the MERGE engine. The new MyISAM 
table instances, as well as the MERGE clone itself, are not 
visible in the table cache. This is not a problem because
all locking is handled by the original MERGE table from which
this is cloned of.
2009-02-12 16:42:07 +05:30
Sergey Vojtovich
a1d1f1eb85 Merge 5.1-bugteam (local) -> 5.1-bugteam. 2009-02-12 14:12:40 +04:00
Sergey Vojtovich
8006c5cd57 Merge 5.0-bugteam -> 5.1-bugteam. 2009-02-12 14:10:07 +04:00
Georgi Kodinov
f9f8fee93c merged bug 33813 to 5.1-bugteam 2009-02-12 11:52:01 +02:00
Sergey Vojtovich
659a2183dd BUG#36737 - having + full text operator crashes mysql
MATCH() function accepts column list as an argument. It was possible to override
this requirement with aliased non-column select expression. Which results in
server crash.

With this fix aliased non-column select expressions are not accepted by MATCH()
function, returning an error.
2009-02-12 13:49:44 +04:00
Georgi Kodinov
4f0c557340 merged bug 33813 to 5.0-bugteam 2009-02-12 11:27:06 +02:00
Chad MILLER
893ca47b63 Merge from bug tree. 2009-02-11 23:44:32 -05:00
Chad MILLER
351124ad3b Merge from bug tree. 2009-02-11 23:37:21 -05:00
Luis Soares
a95e852535 BUG#13684: post push fix for test case.
The test case relies on binlog entries for assertion. The problem is that the
binlog does not get cleaned in pushbuild between tests, resulting in extra
entries in the result file, causing the test to fail.
      
This fix adds a reset master at the beginning of the test, so that we get a
clean binlog file.
2009-02-11 18:46:43 +01:00
Horst Hunger
9664cac946 due to merge. 2009-02-11 16:35:50 +01:00
kent.boortz@sun.com
1f18af1acb Raise version number after cloning 5.1.32 2009-02-11 14:58:50 +01:00
Luis Soares
a24a6a01a5 merge: 5.1-bt --> 5.1-bt local 2009-02-11 14:52:19 +01:00
Vladislav Vaintroub
4ad5db3213 merge 2009-02-11 12:19:33 +01:00
Georgi Kodinov
e66ad2e8c6 merged 5.0-bugteam -> 5.1-bugteam 2009-02-11 12:07:22 +02:00
Georgi Kodinov
2a76e41836 merged 5.1-main -> 5.1-bugteam 2009-02-11 12:05:06 +02:00
Georgi Kodinov
f0dc3a92d5 changed the tree id pending a merge of 5.0-bugteam -> 5.0-main 2009-02-11 12:04:40 +02:00
Horst Hunger
ac90fff18f Reviewed fix for bug#40882: Replaced "sleep 1" by wait_condition, added save/restore start values and closed open sessions. When trying to use "wait_for_query_to_succeed" a type has been fixed, also in "rename.test": Added session count and check and replaced error numbers. 2009-02-11 10:27:52 +01:00
Mats Kindahl
9bc8c703bc Merging with 5.1-bugteam 2009-02-10 22:39:59 +01:00
Mats Kindahl
aa7bf83a2f Bug #36763
TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported.

Correcting some tests that was failing in pushbuild as well as fixing result
file for some tests that are not executed in the default MTR run.
2009-02-10 22:26:37 +01:00
Georgi Kodinov
bf63b815fa merged 5.0-bugteam to 5.1-bugteam 2009-02-10 20:22:34 +02:00
Georgi Kodinov
1a7b0ec920 fixed a libedit compilation problem 2009-02-10 20:19:03 +02:00
Mats Kindahl
e3f51580d7 Merging with 5.1-bugteam 2009-02-10 16:13:44 +01:00
Chad MILLER
b4b7e0fb65 Merge from bugteam team tree. 2009-02-10 10:07:54 -05:00
Mats Kindahl
de59bcbd32 BUG#36763: TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported.
Post-merge fixes. Changes to some result sets.
2009-02-10 15:44:58 +01:00
Chad MILLER
f4f1747d33 Bug#30261: "mysqld --help" no longer possible for root
The check for root-ness would signal an error.  Errors would make the
server exit before usage (help) information was printed.

Now, test for whether we want help regardless of whether we're going
to exit with an error.  If plugins are not initialized by the time we 
print usage information, inform the user that some parameters are 
missing.
2009-02-10 09:41:55 -05:00
Georgi Kodinov
6387fe92ea merged 5.0-bugteam -> 5.1-bugteam 2009-02-10 16:26:18 +02:00
Alexey Kopytov
bc790c9ff6 Merge into dev tree. 2009-02-10 16:27:35 +03:00
Georgi Kodinov
773b18e69a From jperkin : Merge libedit 2.11 and related files,
based on NetBSD CVS as of 2009/02/06 20:09:00.
2009-02-10 14:39:14 +02:00
Alexey Kopytov
a715b70278 Fix for bug #41868: crash or memory overrun with concat + upper,
date_format functions

String::realloc() did not check whether the existing string data fits in
the newly allocated buffer for cases when reallocating a String object
with external buffer (i.e.alloced == FALSE).  This could lead to memory
overruns in some cases.
2009-02-10 15:38:56 +03:00
Vladislav Vaintroub
f19b3a43ac merge 2009-02-10 12:05:53 +01:00
Luis Soares
fa8970fb83 BUG#13684: SP: DROP PROCEDURE|FUNCTION IF EXISTS not binlogged if routine does not exist
There is an inconsistency with DROP DATABASE IF EXISTS, DROP
TABLE IF EXISTS and DROP VIEW IF EXISTS: those are binlogged even
if the DB or TABLE does not exist, whereas DROP PROCEDURE IF
EXISTS does not. It would be nice or at least consistent if DROP
PROCEDURE/STATEMENT worked the same too.
      
Fixed DROP PROCEDURE|FUNCTION IF EXISTS by adding a call to
write_bin_log in mysql_execute_command. Checked also if all
documented "DROP (...) IF EXISTS" get binlogged. Left out DROP
SERVER IF EXISTS because it seems that it only gets binlogged when
using row event (see BUG#25705).
2009-02-10 11:52:19 +01:00
Matthias Leich
c72c5495a3 Merge 5.0 -> 5.1 2009-02-10 11:23:47 +01:00
Bjorn Munch
b6ece6aafa Bug #42590 MTR v1 crashes under Active State Perl
Perl crashes when MTR 2 tries to start v1
Replaced require with system()
2009-02-10 11:00:16 +01:00
Georgi Kodinov
b57c541425 Bug #33813: Schema names are case-sensitive in DROP FUNCTION
The parser was not using the correct fully-qualified-name
production for DROP FUNCTION.
Fixed by copying the production from DROP PROCEDURE.
Tested in the windows specific suite to make sure it's 
tested on a case-insensitive file system.
2009-02-10 11:58:19 +02:00
Ramil Kalimullin
f6017fc4bd Fix for bug #40757: Starting server on Windows with
innodb_flush_method=wrong_value causes crash

Problem: after a failed plugin initialization, incompletely 
initialized data remained in the plugin and handlerton data 
structures. These were used later and caused the crash.

Fix: clean-up plugin related data if initialization failed.

Note: no test case added, hand tested.
2009-02-10 12:37:27 +04:00
Davi Arnaut
9bf6c85d81 Post-merge fix: Complete reversal of bug 33699. 2009-02-10 01:00:11 -02:00
Mats Kindahl
cb73100105 Merging with 5.1-bugteam. 2009-02-09 23:51:59 +01:00
Davi Arnaut
5f119f2825 Merge 5.1-bugteam into main. 2009-02-09 19:41:02 -02:00