Commit graph

56420 commits

Author SHA1 Message Date
Patrick Crews
b7a5717d19 automerge 2009-02-14 17:52:45 -05:00
Alexey Kopytov
5ecbccf9c9 Automerge. 2009-02-14 20:14:10 +03:00
Alexey Kopytov
831914b848 Added missing DROP TABLE to type_float.result. 2009-02-14 20:12:14 +03:00
Alexey Kopytov
48c4ff8010 Fixed parser test failure introduced by the patch for bug #21205. 2009-02-14 19:04:16 +03:00
Alexey Kopytov
4fd80a9dc5 Merge mysql-5.0-bugteam -> mysql-5.1-bugteam 2009-02-14 19:00:11 +03:00
Alexey Kopytov
811ace8364 Fixed several test failures in the funcs_1 suite introduced by the patch for bug #21205. 2009-02-14 18:58:07 +03:00
Alexey Kopytov
c41a700550 Fixed bdb_gis and ndb_gis test failures in PB introduced by the patch for bug #21205. 2009-02-14 18:36:57 +03:00
Ramil Kalimullin
31138433f6 Auto-merge 2009-02-14 14:47:33 +04:00
Ramil Kalimullin
ff8229fbef Fix for bug#21476: stack overflow crashes server; error-message
stack reservation too small

Problem: some tests fail on HP-UX due to insufficient stack reservation.

Fix: increase stack reservation.
2009-02-14 14:40:22 +04:00
Alexey Kopytov
3c5db06b81 Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. 2009-02-14 12:14:05 +03:00
Alexey Kopytov
0614aec4c0 Merge from dev tree. 2009-02-14 12:11:32 +03:00
Alexey Kopytov
9d21ff1148 Merge from dev tree. 2009-02-14 12:09:35 +03:00
Patrick Crews
ffd9672b9b BUG#32667: lowercase_table3.test reports to error log
Cleaned up SQL code in the test.
Needed to move the FLUSH TABLES statement prior to the DROP TABLE t1 to prevent a warning of
Table open on delete and a test fail.
2009-02-13 16:12:59 -05:00
Davi Arnaut
19b053aee6 Empty merge. 2009-02-13 17:32:24 -02:00
Davi Arnaut
9cce8f40eb Remove test case for bug 40264.
Dirty close tricky does not work on Windows.
2009-02-13 17:26:20 -02:00
Tatiana A. Nurnberg
c0255fbc64 auto-merge 2009-02-13 19:18:01 +01:00
Tatiana A. Nurnberg
aa3f93083c Bug#42146 - DATETIME fractional seconds parse error
Bug#38435 - LONG Microseconds cause MySQL to fail a CAST to DATETIME or DATE

Parsing of optional microsecond part in datetime did not
fail gracefully when field width was larger than the allowed
six places.

Now handles up to the correct six places, and disregards
any extra digits without messing up what we've already got.
2009-02-13 19:07:03 +01:00
Alexey Kopytov
7040781c19 Merge from team tree 2009-02-13 19:32:23 +03:00
Alexey Kopytov
7cc2e62e25 Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. 2009-02-13 19:20:56 +03:00
Andrei Elkin
7497edf967 merging from the main to a local branch 2009-02-13 18:20:36 +02:00
Alexey Kopytov
ccd5a4dc46 Merge from dev tree. 2009-02-13 19:17:07 +03:00
Rafal Somla
060c89940f Modifications to MTR and mysqltest to improve feedback from the latter when
testcase checks are made.
      
MTR spawns mysqltest to run check-testcase test before and after each testcase 
it runs. It can also run check-warnings using mysqltest. Since it happened on PB 
that these checks hanged, this patch provides additional feedback to help 
investigating such failures:
      
- mysqltest is modified to give feedback about main steps in execution of a 
testcase if run in verbose mode (including connection to the server),
     
- MTR is modified to run mysqltest in verbose mode when doing check-testcase or 
check-warnings. The diagnostic output from mysqltest is preserved so that it is 
saved upon test failure.
2009-02-13 16:27:33 +01:00
Matthias Leich
6802be0967 Merge 5.0 -> 5.1, in fact null merge because all modifications
needed are alraedy in 5.1
2009-02-13 16:07:56 +01:00
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
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
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
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
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