Commit graph

61353 commits

Author SHA1 Message Date
Guilhem Bichot
39e30ed9e0 Fix for BUG#51215 "log-error partially works with version 5.5": WL 4738 (reengineering of server variables)
had broken the 5.1 behaviour of --log-error: --log-error without argument sent to stderr instead of writing
to a file with an autogenerated name.
2010-03-05 14:08:21 +01:00
Alexander Nozdrin
dad94c24af Make funcs_1.myisam_views experimental on Solaris due to Bug 50595. 2010-03-05 12:28:45 +03:00
Alexander Barkov
a45955793e Fixing non-determenistic results. 2010-03-05 12:17:19 +04:00
Alexander Nozdrin
732103fcb5 Auto-merge from mysql-next-mr-bugfixing. 2010-03-04 18:39:32 +03:00
Alexander Nozdrin
2155847a29 Auto-merge from mysql-next-mr-bugfixing. 2010-03-04 18:34:29 +03:00
Alexander Barkov
79cecfb55e Bug#51675 Server crashes on inserting 4 byte char. after ALTER TABLE to 'utf8mb4'
Bug#51676 Server crashes on SELECT, ORDER BY on 'utf8mb4' column
An additional fix. We should use 0xFFFD as a weight for supplementary
characters, not the "weight for character U+FFFD".
2010-03-04 16:02:30 +04:00
Alexander Barkov
19bda05a3c Bug#51166 mysql client defaults to charset 'ascii'
Using latin1 client character set for ASCII locales:
- because ascii is not a build-in character set
- for better backward compatibility
2010-03-04 15:13:46 +04:00
Alexander Barkov
2b0ff48baa A joint patch for:
Bug#51675 Server crashes on inserting 4 byte char. after ALTER TABLE to 'utf8mb4' 
Bug#51676 Server crashes on SELECT, ORDER BY on 'utf8mb4' column
2010-03-04 15:00:32 +04:00
Horst.Hunger
37c3268cc1 Push the test to next-mr-bar2 to let them run in pushbuild. 2010-03-04 08:34:44 +01:00
Alexander Nozdrin
4f08c6d0e5 A follow-up on WL#5154 and WL#5182: remove forgotten options. 2010-03-03 22:22:02 +03:00
Vladislav Vaintroub
1befd1fb25 merge 2010-03-03 16:06:14 +01:00
Mattias Jonsson
af738870d4 Fix for debug print of null string
(fails on pb for solaris debug_max)
2010-03-03 15:58:12 +01:00
Vladislav Vaintroub
c903a13e6a merge 2010-03-03 15:48:54 +01:00
Vladislav Vaintroub
44084ea4b3 Fix a problem reported by Alik:
when cmake is used for building in a symlinked directory, 
and confguration is later adjusted with "cmake-gui ." After it,
GenServerSource fails with "no rule for <filename>". The reason
for the error is that cmake-gui  resolves "." as realpath and rules
are generated accordingly, while "cmake" used symlinked path

The fix uses ${CMAKE_CURRENT_BINARY_DIR} instead of 
${CMAKE_BINARY_DIR}/sql  for generated files. 
This causes CMake to use relative file names so 
relative file names when generating make rules.
Using relative filenames avoids the problem of 
refering to the same directory using 2 different paths.

Besides, using ${CMAKE_CURRENT_BINARY_DIR} is 
a commonly used style when working with generated 
files.
2010-03-03 12:43:30 +01:00
Vladislav Vaintroub
273d74eaa5 Bug #51488 :missing features and change behavior in cmake runs compared to
autotools runs
- Fix recognition of --with-debug=full in configure wrapper
- Remove CMakeCache.txt in configure wrapper, to match the original
- Fix recognition of max-no-ndb
- Fix broken dependencies of mysql_fix_privilege_table.sql from 
  mysql_system_tables.sql and mysql_system_tables_fix.sql
- Add "distclean target" that informs user about appropriate bzr command
2010-03-03 12:29:34 +01:00
Jon Olav Hauglid
b59f88ee1f Bug #51376 Assert `! is_set()' failed in
Diagnostics_area::set_ok_status on DROP FUNCTION

This assert tests that the server is not trying to send "ok" to
the client if an error has occured during statement processing.

In this case, the assert was triggered by lock timeout errors when
accessing system tables to do an implicit REVOKE after executing
DROP FUNCTION/PROCEDURE. In practice, this was only likely to
happen with very low values for "lock_wait_timeout" (in the bug report
1 second was used). These errors were ignored and the server tried
to send "ok" to the client, triggering the assert.

The patch for Bug#45225 introduced lock timeouts for metadata locks.
This made it possible to get timeouts when accessing system tables.
Note that a followup patch for Bug#45225 pushed after this
bug was reported, changed accessing of system tables such
that the user-supplied timeout value is ignored and the maximum
timeout value is used instead. This exact bug was therefore
only noticeable in the period between the initial Bug#45225 patch
and the followup patch.

However, the same problem could occur for any errors during revoking
of privileges - not just timeouts. This patch fixes the problem by
making sure that any errors during revoking of privileges are
reported to the client. 

Test case added to sp-destruct.test. Since the original bug is not
reproducable now that system tables are accessed using a a long
timeout value, this test instead calls DROP FUNCTION with a grant
system table missing.
2010-03-03 10:24:53 +01:00
Alexander Nozdrin
81f857135a Auto-merge (empty) from mysql-trunk-bugfixing. 2010-03-02 17:37:50 +03:00
Alexander Nozdrin
c17e266437 Manual merge from mysql-next-mr.
Conflicts:
  - sql/sql_base.cc
2010-03-02 17:34:50 +03:00
Alexander Nozdrin
0096e1d1f4 Auto-merge from mysql-trunk. 2010-03-02 17:32:48 +03:00
Dmitry Lenev
72713e02e0 Merged recent changed from mysql-next-mr-bugfixing
into mysql-next-4284 tree.
2010-03-02 11:17:08 +03:00
Alexander Nozdrin
c04e5bbe70 Auto-merge from mysql-trunk-merge. 2010-03-02 10:24:32 +03:00
Alexander Nozdrin
0c01d8d86c Remove test from experimental because Bug 45578 and 46010 are fixed. 2010-03-02 10:22:33 +03:00
Vladislav Vaintroub
01ee0f9677 merge 2010-03-02 06:13:06 +01:00
Vladislav Vaintroub
e1384dc718 Fix WITH_DEBUG problems in CMake build, so people who use configure wrappers do not
suffer. The problem was that when custom C flags were defined with in environment 
variable CFLAGS, WITH_DEBUG did not have any effect. Also, switch from 
WITH_DEBUG=ON to WITH_DEBUG=OFF   was not handled correctly .Expected is switch 
to with RelwithDebInfo or when custom compiler flags  are defined, to None.
2010-03-02 01:53:15 +01:00
Marc Alff
5cc238d3b0 Bug#51612 Un initialized locker_lost variable in pfs_instr.cc
Fixed the missing initialization of locker_lost.

This fix is not strictly necessary, but is desirable to re-align the code
from 5.5 and 6.0, and reduce the spurious code differences.

This will facilitate maintenance and help to apply patches cleanly, for merges.
2010-03-01 17:10:01 -07:00
Mattias Jonsson
24bc23ea11 merge 2010-03-02 00:52:33 +01:00
Mattias Jonsson
b2838f1a70 manual merge fix of bug#42438 in mysql-next-mr-merge 2010-03-02 00:05:30 +01:00
Roy Lyseng
19d25e5658 WL#5252: deprecate --optimizer_search_depth=63
Followup: Changes in sys_vars test suite

  mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
    Added warnings.
2010-03-01 21:19:47 +01:00
Alexander Nozdrin
2ee7f4573b Auto-merge from mysql-trunk-merge. 2010-03-01 21:56:54 +03:00
Alexander Nozdrin
fe6e3bf20a Manual merge from mysql-5.1.
Conflicts:
  - support-files/mysql.spec.sh
  - configure.in
2010-03-01 21:49:06 +03:00
Dmitry Lenev
48367a2155 Merged recent changes from mysql-next-mr-bugfixing
into mysql-next-4284 tree.
2010-03-01 20:07:11 +03:00
Dmitry Lenev
e5876eea6f Merged recent changes from mysql-next-mr-bugfixing
into mysql-next-4284.
2010-03-01 19:48:39 +03:00
Andrei Elkin
16a81cd32f BUG#50296
restoring the maximum of slave_net_timeout as defined
#define LONG_TIMEOUT ((ulong) 3600L*24L*365L)
2010-03-01 18:48:34 +02:00
Roy Lyseng
9302df9131 WL#5252: Deprecate --optimizer_search_depth=63
Add deprecation warning when variable optimizer_search_depth is given
the value 63.
      
  mysql-test/r/greedy_optimizer.result
    Updated with warning text.
  mysql-test/r/mysqld--help-notwin.result
    Updated with warning from mysqld --help --verbose.
  mysql-test/r/mysqld--help-win.result
    Updated with warning from mysqld --help --verbose.
  sql/sys_vars.cc
    Added an update check function to the constructor invocation for
    the optimizer_search_depth variable. The function emits a
    warning message for the value 63.
2010-03-01 17:31:02 +01:00
Dmitry Lenev
178daf9273 Merge recent changes from mysql-next-mr-bugfixing
into mysql-next-4284 tree.
2010-03-01 18:13:57 +03:00
Marc Alff
c33547ee51 local merge before push to mysql-next-mr-bugfixing 2010-03-01 07:43:15 -07:00
Marc Alff
9b2bb69c4a Bug#50296 Slave reconnects earlier than the prescribed slave_net_timeout value
Fixed failed assert on 64 bit platforms, introduced by the previous fix.

mysqld: sys_vars.h:125: Assertion `size == sizeof(T)' failed.
2010-03-01 07:30:22 -07:00
hery.ramilison@sun.com
0bba3928b0 Raise version number after cloning 5.1.45 2010-03-01 11:58:26 +01:00
Joerg Bruehe
158e89792a Spec file for RPMs:
Now that Oracle has legally acquired Sun, change the copyright owner
and the vendor.
2010-03-01 11:42:44 +01:00
Alexander Nozdrin
d73ab35ec9 Auto-merge from mysql-trunk-merge. 2010-03-01 13:15:52 +03:00
Alexander Nozdrin
26de856e5a Auto-merge from mysql-next-mr. 2010-03-01 13:14:34 +03:00
Alexander Nozdrin
4d2360813a Auto-merge from mysql-trunk. 2010-03-01 13:11:57 +03:00
Alexander Nozdrin
ef5ef725e3 Disable partition_debug_sync temporarily awaiting a patch from Mattias. 2010-03-01 13:07:42 +03:00
Alexander Nozdrin
dec27c317b Add configure.am to .bzrignore. 2010-03-01 13:07:06 +03:00
Alexander Nozdrin
b73cba223b Manual merge from mysql-next-mr.
Conflicts:
  - sql/item.cc
2010-03-01 13:06:11 +03:00
Alexander Nozdrin
41110ca1bf Auto-merge (empty) from mysql-trunk-merge. 2010-03-01 12:49:29 +03:00
Alexander Nozdrin
0e380da18b Auto-merge (empty) from mysql-trunk. 2010-03-01 12:47:21 +03:00
Alexander Nozdrin
860ae5d990 Manual merge (empty) from mysql-trunk-merge.
Conflicts:
  - scripts/mysqld_multi.sh
  - sql/item_timefunc.cc
2010-03-01 12:45:36 +03:00
Alexander Nozdrin
26c586008c Auto-merge (empty) from mysql-trunk-merge. 2010-03-01 12:41:28 +03:00
Alexander Nozdrin
1913b715bc Manual merge from mysql-trunk-merge.
Conflicts:
  - sql/share/Makefile.am
2010-03-01 12:39:44 +03:00