Commit graph

61739 commits

Author SHA1 Message Date
Magnus Blåudd
fda5004d36 Merge in fix for bug#42589 2010-03-15 14:57:20 +01:00
Jon Olav Hauglid
dd69b281f0 Bug #51160 Deadlock around SET GLOBAL EVENT_SCHEDULER = ON|OFF
This deadlock could occour betweeen one connection executing
SET GLOBAL EVENT_SCHEDULER= ON and another executing SET GLOBAL
EVENT_SCHEDULER= OFF. The bug was introduced by WL#4738.

The first connection would hold LOCK_event_metadata (protecting
the global variable) while trying to lock LOCK_global_system_variables
starting the event scheduler thread (in THD:init()).

The second connection would hold LOCK_global_system_variables
while trying to get LOCK_event_scheduler after stopping the event
scheduler inside event_scheduler_update().

This patch fixes the problem by not using LOCK_event_metadata to
protect the event_scheduler variable. It is still protected using
LOCK_global_system_variables. This fixes the deadlock as it removes 
one of the two mutexes used to produce it.

However, this patch opens up the possibility that the event_scheduler
variable and the real event_scheduler state can become out of sync
(e.g. variable = OFF, but scheduler running). But this can only
happen under very unlikely conditions - two concurrent SET GLOBAL
statments, with one thread interrupted at the exact wrong moment.
This is preferable to having the possibility of a deadlock.

This patch also fixes a bug where it was possible to exit create_event()
without releasing LOCK_event_metadata if running out of memory during
its exection.

No test case added since a repeatable test case would have required
excessive use of new sync points. Instead we rely on the fact that
this bug was easily reproduceable using RGQ tests.
2010-03-15 14:52:25 +01:00
Alexander Nozdrin
27bb4377c6 Auto-merge from mysql-trunk. 2010-03-15 13:22:26 +03:00
Mats Kindahl
d21fa1426a Bug #51938 plugin_dir gets bad default value
When building the script directory using a CMake-based build, both the
variables in config.h.cmake (including PLUGINDIR) and the variables in
CMakeList.txt (which includes pkgplugindir).

However, for autotools-based builds, only pkgplugindir is substituted,
which means that the plugin-path is not substituted.

This patch solves the problem by using pkgplugindir, which works on both
CMake-based and autotools-based builds, instead of PLUGINDIR.
2010-03-14 21:11:19 +01:00
Staale Smedseng
3f4d8edb84 Bug #49829 Many "hides virtual function" warnings with
SunStudio
      
SunStudio compilers of late warn about methods that might hide
methods in base classes due to the use of overloading combined
with overriding. SunStudio also warns about variables defined
in local socpe or method arguments that have the same name as
a member attribute of the class.
      
This patch renames methods that might hide base class methods,
to make it easier both for humans and compilers to see what is
actually called. It also renames variables in local scope.
2010-03-14 17:01:45 +01:00
Davi Arnaut
0e9451186d Post-merge fix: replace plugin extension output. 2010-03-14 08:16:59 -03:00
Davi Arnaut
d9f1abe995 Post-merge fix: remove unnecessary flush privileges. 2010-03-13 18:32:42 -03:00
Joerg Bruehe
ff6385af70 Fix C++ style comments, they cause syntax errors in C file. 2010-03-13 22:17:47 +01:00
Konstantin Osipov
9cb8a98216 A review comment for the fix for Bug#46672.
Remove unnecessary need_reopen loops.
2010-03-13 13:58:27 +03:00
joerg.bruehe@sun.com
3bba724bbb Raise version number after cloning 5.5.3-m3 2010-03-12 21:18:20 +01:00
Alexander Nozdrin
c5c55e3fa0 Auto-merge from mysql-trunk. 2010-03-12 21:13:35 +03:00
Alexander Nozdrin
9d746b025a Auto-merge from mysql-next-mr. 2010-03-12 21:11:31 +03:00
Alexander Nozdrin
43594fed64 Auto-merge (empty) from mysql-trunk. 2010-03-12 21:08:38 +03:00
Alexander Nozdrin
0ab84d0f83 Auto-merge from mysql-next-mr-bugfixing. 2010-03-12 21:04:35 +03:00
Alexander Nozdrin
dc2a2e151d Auto-merge from mysql-trunk-bugfixing. 2010-03-12 21:03:40 +03:00
Luis Soares
66ee3a4490 BUG#51716 post push fix.
There are two issues fixed here:

  1. We needed to update the result file, for some of 
     mysqlbinlog_* tests, because now the some padding chars
     are not output anymore.

  2. We needed to change the Field_string::pack so that
     for BINARY types the padding chars are not packed 
     (lengthsp will return full length for these types).
2010-03-12 12:42:30 +00:00
Alexey Kopytov
41f23283e5 Post-merge fix for main.xa failures. 2010-03-12 13:13:02 +03:00
Joerg Bruehe
283188c939 Automerge the bug#49022 fix correction into next-mr-bugfixing. 2010-03-12 10:56:56 +01:00
Alexey Kopytov
4db97ede5b Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/subselect.result
Text conflict in mysql-test/r/subselect3.result
Text conflict in mysql-test/r/type_datetime.result
Text conflict in sql/share/Makefile.am
2010-03-12 12:51:53 +03:00
Joerg Bruehe
1f9235f04b Fix for the bug#49022 patch, detected by further testing. 2010-03-11 16:37:51 +01:00
Vladislav Vaintroub
2b1846473f Bug#51949 - make_binary_distribution fails on Mac.
Unquoted ${CMAKE_CPACK_COMMAND} is used in this script.
This variable resolves to cpack's real path with spaces, e.g
 /Applications/CMake 2.6.4-app/Contents/bin/cpack. 
Script fails due to lack of quotes.

Fix is to use quotes around ${CMAKE_CPACK_COMMAND}.
2010-03-11 15:41:45 +01:00
Konstantin Osipov
42b7812898 A fix for Bug#49972 "Crash in prepared statements":
The problem is introduced by WL#4435 "Support OUT-parameters in 
prepared statements".
When a statement that has out parameters was reprepared,
the reprepare request error was ignored, and an
attempt to send out parameters to the client was made.

Since the out parameter list was not initialized in case
of an error, this attempt led to a crash.

Don't try to send out parameters to the client
if an error occurred in statement execution.
2010-03-11 16:47:34 +03:00
Georgi Kodinov
cbfdc588e9 Bug #44178: mysql cli does not comply with GPLv2 clause 2c
Applied a path from Jim Winstead : Added a GPL notice.
Added the missing '(c)' and 'v2'.
2010-03-11 15:16:54 +02:00
Sergey Vojtovich
a955cc035a Merge fix for BUG48265 to mysql-5.1-bugteam. 2010-03-11 18:28:39 +04:00
Mattias Jonsson
90c200a216 Bug#42954: SQL MODE 'NO_DIR_IN_CREATE' does not work with subpartitions
There was no check for DATA/INDEX DIRECTORY for subpartitions

Added the same check as for partitions.
2010-03-11 14:00:36 +01:00
Luis Soares
b7a5c1b329 Automerge: mysql-next-mr-bugfixing bug branch --> mysql-next-mr-bugfixing latest. 2010-03-11 11:28:35 +00:00
Sergey Vojtovich
1e2eb3cd46 Merge mysql-5.1 to mysql-5.1-bugteam. 2010-03-11 15:19:01 +04:00
Alexander Barkov
a388efbffa An additional fix for WL#1213 4-byte UTF8
- Fixing crash on attempt to create a fulltext index with an utf8mb4 column
- fixing wrong border width  for supplementary characters in mysql client:

  mysql --default-character-set=utf8mb4 -e "select concat(_utf32 0x20000,'a')"
2010-03-11 14:34:11 +04:00
He Zhenxing
99d1b2bd9a Auto merge 2010-03-11 10:58:20 +08:00
He Zhenxing
9d28e0f361 Enable rpl_semi_sync test on Windows 2010-03-11 10:56:46 +08:00
He Zhenxing
3760845b72 Auto merge from 5.1-rep-semisync 2010-03-11 10:22:18 +08:00
Luis Soares
9b5a6748e0 Fix for BUG#51716 and BUG#51787: test case improvements.
Split rpl_row_charset into:

  - rpl_row_utf16.
  - rpl_row_utf32.

This way these tests can run independently if server supports
either one of the charsets but not both.

Cleaned up rpl_row_utf32 which had a spurious instruction:
-- let $reset_slave_type_conversions= 0
2010-03-10 22:20:39 +00:00
Alfranio Correia
6e3646e1ca Merge next-mr-bugfixing (local) --> next-mr-bugfixing. 2010-03-10 20:28:41 +00:00
Davi Arnaut
09f9014238 Automatic merge. 2010-03-10 15:44:58 -03:00
Luis Soares
2c368f050e Fix for BUG#51716 and BUG#51787.
In BUG#51787 we were using the wrong charset to print out the
data. We were using the field charset for the string that would
hold the information. This caused the assertion, because the
string length was not aligned with UTF32 bytes requirements for
storage.

We fix this by using &my_charset_latin1 in the string object
instead of the field->charset(). As a side-effect, we needed to
extend the show_sql_type interface so that it took the field
charset is now passed as a parameter, so that one is able to
calculate the correct field size.

In BUG#51716 we had issues with Field_string::pack and
Field_string::unpack. When packing, the length was incorrectly
calculated. When unpacking, the padding the string would be
padded with the wrong bytes (a few bytes less than it should).

We fix this by resorting to charset abstractions (functions) that
calculate the correct length when packing and pad correctly the
string when unpacking.
2010-03-10 17:33:51 +00:00
Joerg Bruehe
b016f1b2ce Automerge into next-mr-bugfixing. 2010-03-10 17:26:49 +01:00
Martin Hansson
2cc8c47b93 Bug#50545: Single table UPDATE IGNORE crashes on
join view in sql_safe_updates mode. 

This bug was unexpectedly fixed along with bug 
number 49534. This patch contains only the test
case.
2010-03-10 17:10:05 +01:00
Sergey Vojtovich
8795907e11 Merge an addition to BUG51342 5.0-bugteam -> 5.1-bugteam. 2010-03-10 19:31:22 +04:00
Sergey Vojtovich
774cba9505 An addition to fix for
BUG#51342 - more xid crashing

Restore autocommit variable by supplying explicit value.
2010-03-10 19:28:49 +04:00
Alexander Nozdrin
5c7687c2ef Auto-merge from mysql-next-mr-bugfixing. 2010-03-10 17:58:35 +03:00
Konstantin Osipov
861b86d678 A fix and a test case for Bug#51710 FLUSH TABLES <view> WITH READ
LOCK kills the server.

Prohibit FLUSH TABLES WITH READ LOCK application to views or
temporary tables.
Fix a subtle bug in the implementation when we actually
did not remove table share objects from the table cache after 
acquiring exclusive locks.
2010-03-10 17:35:25 +03:00
Davi Arnaut
30cb1779ed Bug#33669: Transactional temporary tables do not work under --read-only
The problem was that in read only mode (read_only enabled),
the server would mistakenly deny data modification attempts
for temporary tables which belong to a transactional storage
engine (eg. InnoDB).

The solution is to allow transactional temporary tables to be
modified under read only mode. As a whole, the read only mode
does not apply to any kind of temporary table.
2010-03-10 10:36:40 -03:00
Joerg Bruehe
4d75f6e251 Part of the fixes for bug#49022
Plugins included into bin release cannot be
    installed on debug version of server

Ensure that the plugin files of the debug build
get into the optimized tree, so that they find
their way into the final RPMs.
2010-03-10 14:36:27 +01:00
Alexander Nozdrin
93e4d17412 Auto-merge (empty) from mysql-trunk-bugfixing. 2010-03-10 16:35:38 +03:00
Alexander Nozdrin
29577eddfb Auto-merge (empty) from mysql-next-mr. 2010-03-10 16:34:45 +03:00
Alexander Nozdrin
9661d1ef34 Auto-merge from mysql-trunk. 2010-03-10 16:34:12 +03:00
Alexander Nozdrin
feb9835245 Auto-merge (empty) from mysql-trunk. 2010-03-10 16:27:18 +03:00
Alexander Nozdrin
9ad6cb15ad Auto-merge from mysql-next-mr. 2010-03-10 16:26:34 +03:00
Alexander Nozdrin
f9b0b01466 Auto-merge from mysql-next-mr-bugfixing. 2010-03-10 16:22:52 +03:00
Luis Soares
fccd3c1a1f BUG#50442: MTR check for rpl_sync fails
The test case crashes and recovers the server twice, and while 
recovering InnoDB sets innodb_file_format_check to different
format on second restart. This makes the test case clean up
check to fail.

We fix this by deploying the option "--innodb_file_format_check='ON'"
in slave startup configuration. This makes the innodb_file_format_check
to not change on secod restart.
2010-03-10 12:40:29 +00:00