Commit graph

67961 commits

Author SHA1 Message Date
Alexander Nozdrin
7642b38834 Merge from mysql-5.1-bugteam. 2010-11-24 13:43:31 +03:00
Alexander Nozdrin
56f3f2245e Merge from mysql-5.5-bugteam. 2010-11-24 13:43:20 +03:00
Alexander Nozdrin
47cfb2c58c Merge from mysql-5.0-bugteam. 2010-11-24 13:40:32 +03:00
Alexander Nozdrin
7a3636c1af Merge from mysql-5.1-bugteam. 2010-11-24 13:23:44 +03:00
Alexander Nozdrin
d7a4672cf7 Merge from mysql-5.0-bugteam. 2010-11-24 13:07:37 +03:00
Tatiana A. Nurnberg
9ab7421b10 merge 2010-11-24 10:02:46 +00:00
Alexander Nozdrin
174a6962da A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all
EXCEPTIONS-CLIENT from all the places.
2010-11-24 12:53:39 +03:00
Bjorn Munch
222dd6e138 upmerge 58424 2010-11-24 10:47:50 +01:00
Bjorn Munch
e1fa8cb9bb Bug #58424 mtr ignores failing mysqltest in the presence of expect file for mysqld
If mysqltest dies, mtr waits to see if mysqld dies too within 100ms
But in that case, it should not care about expected crash
Fix: jump past the code that checks the expect file
2010-11-24 10:22:03 +01:00
Tatiana A. Nurnberg
eda8b1feeb merge 2010-11-24 08:50:04 +00:00
Jonathan Perkin
7427df4a80 EXCEPTIONS-CLIENT was removed, update the RPM spec file.
While here, support supplying a '-j' flag to make(1) from
the environment.
2010-11-23 15:24:14 +00:00
Bjorn Munch
4ff8a4b3de Bug #58415 mtr cannot find libmysqld.dll in new 5.5 packages
Done as suggested
Also tested from src build directory
2010-11-23 15:03:44 +01:00
Ramil Kalimullin
1b897ad1d8 Auto-merge with mysql-5.5-bugteam. 2010-11-23 16:44:26 +03:00
Ramil Kalimullin
9919ac5c97 binlog.binlog_row_failure_mixing_engines test disabled.
See bug #58416.
2010-11-23 16:35:40 +03:00
Bjorn Munch
f2b4622346 Bug #43418 MTR2: does not notice a memory leak occuring at shutdown of mysqld w/ --valgrind
Follow-up discussed with Reporter:
Avoid hard shutdown after test failure, if caused by server log warning
  AND we are running valgrind
More general pick-up of valgrind summaries, order may apparently vary
Do exit(1) if we did find valgrind summary warnings
2010-11-23 14:34:00 +01:00
Ramil Kalimullin
743fd50d62 Auto-merge with mysql-5.1-bugteam. 2010-11-23 16:08:10 +03:00
Ramil Kalimullin
0e60956cf3 Auto-merge with mysql-5.0-bugteam. 2010-11-23 15:26:07 +03:00
Sergey Glukhov
ee2b93944b 5.1-bugteam->5.5-bugteam merge 2010-11-23 13:47:35 +03:00
Sergey Glukhov
7704e3c2c2 Bug#56862 Execution of a query that uses index merge returns a wrong result
In case of low memory sort buffer QUICK_INDEX_MERGE_SELECT creates
temporary file where is stores row ids which meet QUICK_SELECT ranges
except of clustered pk range, clustered range is processed separately.
In init_read_record we check if temporary file is used and choose
appropriate record access method. It does not take into account that
temporary file contains partial result in case of QUICK_INDEX_MERGE_SELECT
with clustered pk range.
The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT
with clustered pk range is used.
2010-11-23 13:18:47 +03:00
Tor Didriksen
229da09502 Bug #58372 cmake should not write temporary files in the source directory 2010-11-23 10:26:26 +01:00
Magnus Blåudd
54dd014a13 Merge 2010-11-24 13:48:28 +01:00
Magnus Blåudd
2d46b515a5 Merge 5.5-bug57604 into 5.5-bugteam 2010-11-24 12:12:39 +01:00
Magnus Blåudd
b3f9f0c388 Merge 5.5-bug58158 into 5.5-bugteam 2010-11-24 11:49:10 +01:00
Magnus Blåudd
f9c3be71d1 WL#5665: Removal of the autotools-based build system
- Make the cmake files depend on VERSION, causing
   cmake rerun when VERSION changes
2010-11-24 11:37:59 +01:00
Gleb Shchepa
b95f75f889 empty upmerge after backport of bug 55568
5.0-security --> 5.1-security
2010-11-23 00:34:22 +03:00
Gleb Shchepa
3586f7727f backport: Bug #55568 from 5.1-security to 5.0-security
> revision-id: alexey.kopytov@sun.com-20100824103548-ikm79qlfrvggyj9h
> parent: sunny.bains@oracle.com-20100816001222-xqc447tr6jwh8c53
> committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
> branch nick: 5.1-security
> timestamp: Tue 2010-08-24 14:35:48 +0400
> message:
>   Bug #55568: user variable assignments crash server when used
>               within query
>   
>   The server could crash after materializing a derived table
>   which requires a temporary table for grouping.
>   
>   When destroying the temporary table used to execute a query for
>   a derived table, JOIN::destroy() did not clean up Item_fields
>   pointing to fields in the temporary table. This led to
>   dereferencing a dangling pointer when printing out the items
>   tree later in the outer SELECT.
>   
>   The solution is an addendum to the patch for bug37362: in
>   addition to cleaning up items in tmp_all_fields3, do the same
>   for items in tmp_all_fields1, since now we have an example
>   where this is necessary.
2010-11-23 00:29:47 +03:00
Davi Arnaut
e9379baa22 Assorted fixes for test failures. 2010-11-22 14:10:44 -02:00
Alexander Nozdrin
522d5e5ae5 Merge from mysql-5.1-bugteam. 2010-11-22 18:48:25 +03:00
Alexander Nozdrin
e1923f51e5 Merge from mysql-5.0-bugteam. 2010-11-22 16:32:59 +03:00
Alexander Nozdrin
e9f78310c0 Patch for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file). 2010-11-22 16:27:49 +03:00
Alexander Nozdrin
db9b47466d Patch for Bug#58339 (Replace Server GPL README file). 2010-11-22 16:25:50 +03:00
MySQL Build Team
091f0eb4ee merge 2010-11-22 13:58:42 +01:00
Ramil Kalimullin
cc5263b223 Manual merge from mysql-5.5-bugteam. 2010-11-22 14:47:28 +03:00
Jon Olav Hauglid
fcaba4f336 This patch fixes the bug which caused the funcs_1.storedproc
test case to give valgrind warnings.

The problem was that when comparing two MDL key buffers using
memcmp(), 1 was added to the buffer length. However, this was
no longer needed since the buffer length already included the
'\0' terminator.
2010-11-22 11:50:20 +01:00
Davi Arnaut
1c72d62c46 WL#5665: Removal of the autotools-based build system
Remove some more files which are unused.
2010-11-22 08:43:36 -02:00
Sunanda Menon
f9d0242e2d merge 2010-11-22 11:35:48 +01:00
Ramil Kalimullin
0628752fe9 Manual-merge from mysql-5.1-bugteam. 2010-11-22 12:21:10 +03:00
Guilhem Bichot
b5586c67ec Fix for Bug#56138 "valgrind errors about overlapping memory when double-assigning same variable",
and related small fixes.
2010-11-22 09:57:59 +01:00
Marc Alff
218ca24cd9 local merge 2010-11-21 14:32:48 +01:00
Davi Arnaut
5324d10fe7 WL#5665: Removal of the autotools-based build system
Remove some more leftovers from the initial removal:

o Update relevant mentions of configure.in throughout
the source code.

o Remove win/configure.js, which at this point just
duplicates logic already present in CMake based build
system.

o Remove support files which relied on the autotools
build system. In any case, MySQL is no longer officially
supported on SCO.

o Remove files which are no longer part of the build.
2010-11-20 20:56:09 -02:00
Guilhem Bichot
b3232453a1 merge of 5.1-bugteam 2010-11-22 10:13:46 +01:00
Davi Arnaut
f6deb00a56 WL#5665: Removal of the autotools-based build system
The autotools-based build system has been superseded and
is being removed in order to ease the maintenance burden on
developers tweaking and maintaining the build system.

In order to support tools that need to extract the server
version, a new file that (only) contains the server version,
called VERSION, is introduced. The file contents are human
and machine-readable. The format is:

MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=8
MYSQL_VERSION_EXTRA=-rc

The CMake based version extraction in cmake/mysql_version.cmake
is changed to extract the version from this file. The configure
to CMake wrapper is retained for backwards compatibility and to
support the BUILD/ scripts. Also, a new a makefile target
show-dist-name that prints the server version is introduced.
2010-11-20 12:47:50 -02:00
Davi Arnaut
e1cba38b6c Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. 2010-11-20 12:37:55 -02:00
Davi Arnaut
871930e708 Bug#57994: Compiler flag change build error : my_redel.c
Although ICC identifies itself as GCC, even in version numbers,
it does not support the stpcpy built-in.
2010-11-20 12:29:51 -02:00
Vladislav Vaintroub
ece6212f89 avoid useless system check on Windows 2010-11-20 00:56:07 +01:00
Vladislav Vaintroub
2cf7ab1578 merge 2010-11-20 00:23:13 +01:00
Vladislav Vaintroub
bf6a7d09e9 Bug#58313: CMake stops with VS Express if -DBUILD_CONFIG=mysql_release.cmake
Bug : -DBUILD_CONFIG=mysql_release sets SIGNCODE parameter which requires 
singtool.exe (part of Windows SDK)  in order to be able to sign the binaries (
only if valid certificate is found). However singtool is not a part of the SDK shipped
with Visual Studio Express, so the build fails claiming missing singtools.exe

Fix: Do not  use SIGNCODE  wiith VC Express.

Also, fix broken nmake build (*.rc files could not be compiled due to ADD_DEFINITIONS
contaning C/C++ compiler specific flags)
2010-11-20 00:20:18 +01:00
Alexander Barkov
77c098a722 Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
Regression introduced by WL#2649.

Problem: queries with date/datetime columns did not use indexes:
set names non_latin1_charset;
select * from date_index_test
where date_column between '2010-09-01' and '2010-10-01';

before WL#2649 indexes worked fine because charset of 
date/datetime
columns was BINARY which always won.

Fix: testing that collation of the operation matches collation 
of the field is only needed in case of "real" string data types.
For DATE, DATETIME it's not needed.


  @ mysql-test/include/ctype_numconv.inc
  @ mysql-test/r/ctype_binary.result
  @ mysql-test/r/ctype_cp1251.result
  @ mysql-test/r/ctype_latin1.result
  @ mysql-test/r/ctype_ucs.result
  @ mysql-test/r/ctype_utf8.result
  Adding tests

  @ sql/field.h
  Adding new method Field_str::match_collation_to_optimize_range()
  for use in opt_range.cc to distinguish between
  "real string" types like CHAR, VARCHAR, TEXT
  (Field_string, Field_varstring, Field_blob)

  and "almost string" types DATE, TIME, DATETIME
  (Field_newdate, Field_datetime, Field_time, Field_timestamp)

  @ sql/opt_range.cc
  Using new method instead of checking result_type() against STRING result.

Note:

  Another part of this problem (which is not regression) 
  is submitted separately (see bug##58329).
2010-11-19 20:15:47 +03:00
Alexander Barkov
677639f46a Bug#58175 xml functions read initialized bytes when conversions happen
Problem:

 nr_of_decimals could read behind the end of the buffer
 in case of a non-null-terminated string, which caused
 valgring warnings.

Fix:

  fixing nr_of_decimals not to read behind the "end" pointer.

modified:

  @ mysql-test/r/xml.result
  @ mysql-test/t/xml.test
  @ sql/item.cc
2010-11-19 18:24:29 +03:00
Georgi Kodinov
1ab1cb8a77 Bug #58119: Typo in warning on log: [Warning] 'proxes_priv' entry
Fixed a typo in an error message.
2010-11-19 13:37:25 +02:00