Commit graph

66514 commits

Author SHA1 Message Date
Mats Kindahl
6c64f826eb Merging with mysql-5.5 2010-08-23 15:32:39 +02:00
Mats Kindahl
f0af63ad50 WL#5363: Thread pool interface
Updating result files containing output of --help --verbose.
2010-08-18 12:53:43 +02:00
Alexander Nozdrin
5e638f4755 Auto-merge from mysql-5.5-merge. 2010-08-18 11:17:19 +04:00
Mats Kindahl
e1e6c32b72 WL#5363: Thread pool interface
Patch to make Visual C++ happy.
2010-08-17 07:46:53 +02:00
Mats Kindahl
cd34770558 Merging with mysql-5.5-stage. 2010-08-16 14:50:27 +02:00
Alexander Nozdrin
9c41a9909a Auto-merge from mysql-5.5. 2010-08-16 10:46:21 +04:00
Alexander Nozdrin
5cb0ccebf3 Empty merge from mysql-5.5. 2010-08-16 10:30:07 +04:00
Alexander Nozdrin
2585da55ac Auto-merge from mysql-5.5-stage. 2010-08-16 10:25:56 +04:00
Alexander Nozdrin
496e1fb46c Disable test cases due to Bug 55966. 2010-08-13 14:07:27 +04:00
Alexander Nozdrin
13ec2a1625 Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).
Fixing copyright text.
2010-08-12 19:19:57 +04:00
Alexander Nozdrin
93594dff84 Auto-merge from mysql-5.5-bugfixing. 2010-08-12 17:55:27 +04:00
Alexander Nozdrin
7b3ea8fef8 Fix use of uninitialized variable. 2010-08-12 16:51:46 +04:00
Guilhem Bichot
124fc93dba fix for Bug #55672 "mysql_upgrade dies with internal error":
it couldn't parse the --ssl option.
2010-08-11 19:56:56 +02:00
Marc Alff
5c85a9388a Bug#55462 Performance schema: reduce the overhead of PFS_events_waits::m_wait_class
This is a performance improvement fix.

Removed the "volatile" property of PFS_events_waits::m_wait_class.
Simplified the code accordingly.
2010-08-12 03:51:58 -06:00
Martin Hansson
76aee43060 Merge of fix for Bug#54444. 2010-08-11 17:55:07 +02:00
Martin Hansson
a89224ba85 Bug#54444: Do not run main.range test for products without partitioning
feature

The test for bug no 50939 was put in range.test which isn't such a good idea
since it requires partitioning. Fixed by moving the test case to
partitioning_range.test.
2010-08-11 14:13:59 +02:00
Jonathan Perkin
66972aa2b3 Merge to mysql-5.5-bugfixing 2010-08-10 15:06:04 +01:00
Georgi Kodinov
59c59c7a62 merge 2010-08-10 16:41:53 +03:00
Georgi Kodinov
11b1c9b76c merge 2010-08-10 16:39:57 +03:00
Georgi Kodinov
5781bfa271 Bug #55809: Server README not current
Updated the README file.
2010-08-10 16:32:45 +03:00
Alfranio Correia
bd3aa7eb78 BUG#50312 Warnings for unsafe sub-statement not returned to client
After BUG#36649, warnings for sub-statements are cleared when a 
new sub-statement is started. This is problematic since it suppresses
warnings for unsafe statements in some cases. It is important that we
always give a warning to the client, because the user needs to know
when there is a risk that the slave goes out of sync.
                        
We fixed the problem by generating warning messages for unsafe statements
while returning from a stored procedure, function, trigger or while
executing a top level statement.
                        
We also started checking unsafeness when both performance and log tables are
used. This is necessary after the performance schema which does a distinction
between performance and log tables.
2010-08-10 12:32:54 +01:00
Vladislav Vaintroub
89ad5fa810 Bug #55842 CMake: bad dependencies on sql/lex_hash.h
Fix by adding "DEPENDS gen_lex_hash" to ADD_CUSTOM_COMMAND(),
so it regenerates lex_hash.h whenever gen_lex_lash changes.

Also, make sql dependent on GenServerSource to avoid concurrent 
generation of lex_hash.h (once for sql , and in parallel for embedded)
2010-08-09 21:47:26 +02:00
Alexander Nozdrin
c70328c4d5 Disable rpl_ndb.rpl_ndb_row_implicit_commit_binlog due to Bug 55849. 2010-08-09 20:55:26 +04:00
Alexander Nozdrin
e7f79394bd Follow-up for Bug 23032: update NDB result files. 2010-08-09 20:52:26 +04:00
Jonathan Perkin
aeea7b6d25 Don't try to remove from an empty list. 2010-08-09 15:41:15 +01:00
Jonathan Perkin
9ae1b1d157 Apply wlad's fix for bug#55215 2010-08-09 14:27:04 +01:00
Davi Arnaut
8978c1cde2 Remove error injection option, it's not being used. 2010-08-09 10:23:55 -03:00
Davi Arnaut
a756b9bd27 Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Post-merge fix: add missing comma.
2010-08-09 10:23:14 -03:00
Jon Olav Hauglid
6d3078e231 manual merge from mysql-5.1-bugteam 2010-08-09 14:11:29 +02:00
Jon Olav Hauglid
cc3be1aee0 Bug #54106 assert in Protocol::end_statement,
INSERT IGNORE ... SELECT ... UNION SELECT ...

This assert was triggered by INSERT IGNORE ... SELECT. The assert checks that a
statement either sends OK or an error to the client. If the bug was triggered
on release builds, it caused OK to be sent to the client instead of the correct
error message (in this case ER_FIELD_SPECIFIED_TWICE).

The reason the assert was triggered, was that lex->no_error was set to TRUE
during JOIN::optimize() because of IGNORE. This causes all errors to be ignored.
However, not all errors can be ignored. Some, such as ER_FIELD_SPECIFIED_TWICE
will cause the INSERT to fail no matter what. But since lex->no_error was set,
the critical errors were ignored, the INSERT failed and neither OK nor the
error message was sent to the client.

This patch fixes the problem by temporarily turning off lex->no_error in
places where errors cannot be ignored during processing of INSERT ... SELECT.

Test case added to insert.test.
2010-08-09 13:39:59 +02:00
Georgi Kodinov
cad519be9b merge 2010-08-06 16:52:17 +03:00
Davi Arnaut
c562aece2e Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Post-merge fix: remove --with-debug=full, it was only used for safemalloc.
2010-08-06 09:59:38 -03:00
Georgi Kodinov
87acb536f1 Bug #54909: Confusing description about read_buffer_size and
read_rnd_buffer_size

Applied the updated description from Paul's patch.
2010-08-06 15:56:23 +03:00
Bjorn Munch
6777cc0db6 merge from 5.1-bugteam of merge from 5.1-mtr 2010-08-06 13:37:05 +02:00
Bjorn Munch
ae2c3d62e9 Bug #55503 MTR fails to filter LEAK SUMMARY from valgrind report of restarted servers
Undo workaround as fix is being merged in
2010-08-06 11:35:17 +02:00
Bjorn Munch
8e242e8140 merge from 5.1-mtr 2010-08-06 11:13:52 +02:00
Bjorn Munch
f886745dfa merge from trunk-mtr 2010-08-05 14:53:09 +02:00
Bjorn Munch
489e6c136b upmerge 55582 2010-08-05 14:41:07 +02:00
Georgi Kodinov
99f7f9a907 merge 2010-08-05 15:34:19 +03:00
Davi Arnaut
37da529d9f Bug#55601: BUILD/check-cpu in mysql-trunk is broken on Mac OS X 10.5
Restore the original behavior of check-cpu with respect to core2.
It isn't used as a actual target processor type, but as a mean to
perform other kinds of architecture checks.
2010-08-05 09:32:23 -03:00
Vladislav Vaintroub
ff1ee26107 Build cleanups
- Simplify sql-bench installation, 
do not try to resolve names : this leads to probem
if builddir is symlink located on different filesystem.
(reported by alik)

- Make WITHOUT_XXX (disabling plugin) work for DEFAULT
plugins. Prior to the patch is behaved just like 
MANDATORY.

- LINK_LIBRARIES in MYSQL_ADD_PLUGIN had no effect for
statically linked plugins.

- Fix constant rebuild of initdb target on Windows.
2010-08-05 18:38:24 +02:00
Georgi Kodinov
82e2ca0181 Addendum to bug #42144 : fixed a wrong type conversation causing plugin tests
failures on sparc64.
2010-08-05 15:10:24 +03:00
Martin Hansson
f77996950a Bug#54568: create view cause Assertion failed: 0,
file .\item_subselect.cc, line 836

IN quantified predicates are never executed directly. They are rather wrapped
inside nodes called IN Optimizers (Item_in_optimizer) which take care of the
execution. However, this is not done during query preparation. Unfortunately
the LIKE predicate pre-evaluates constant right-hand side arguments even
during name resolution. Likely this is meant as an optimization.

Fixed by not pre-evaluating LIKE arguments in view prepare mode.
2010-08-05 12:42:14 +02:00
Evgeny Potemkin
1eb9375a18 Auto-merged. 2010-08-05 14:33:10 +04:00
Georgi Kodinov
84686593ad Bug #42144: plugin_load fails
Reverted the ulong->uint diff
Re-applied the first diff.
The original commit message follows:

enum plugin system variables are ulong internally, not int.
On systems where long is not the same as an int it causes
problems. 
Fixed by correct typecasting. Removed the test from the 
experimental list.
2010-08-04 15:58:09 +03:00
Bjorn Munch
992f49c0c4 merge from 5.1 2010-08-04 12:19:51 +02:00
Alexander Nozdrin
265873c7c2 Fix default.conf. 2010-08-04 13:14:09 +04:00
Bjorn Munch
0792d2b069 Bug #55582 mtr root detection (and if-expression execution) broken
Follow-up patch: added test cases for -0 and while
2010-08-04 10:52:45 +02:00
Alexander Nozdrin
7d0c4cb5c6 Auto-merge from mysql-5.5. 2010-08-04 12:18:32 +04:00
Alexander Nozdrin
a342369478 Fix default.conf. 2010-08-04 12:14:25 +04:00