Jonathan Perkin
40856e830d
bug#55250: 5.5.5-m3 incorrectly compiled with exceptions on Solaris/x86
...
Put '-features=no%except' back into Solaris/x86 CXXFLAGS.
2010-07-19 15:23:02 +01:00
Alexander Nozdrin
9503a8e23f
Manual merge from mysql-trunk.
...
Conflicts:
- scripts/CMakeLists.txt
2010-07-19 18:00:29 +04:00
sunanda.menon@sun.com
226852ea14
Merge from mysql-5.5.5-m3-release
2010-07-19 12:10:01 +02:00
Jon Olav Hauglid
d4885416b7
manual merge from mysql-5.1-bugteam
2010-07-19 11:21:24 +02:00
Jon Olav Hauglid
4b2378a148
Bug #54734 assert in Diagnostics_area::set_ok_status
...
This assert checks that the server does not try to send OK to the
client if there has been some error during processing. This is done
to make sure that the error is in fact sent to the client.
The problem was that view errors during processing of WHERE conditions
in UPDATE statements where not detected by the update code. It therefore
tried to send OK to the client, triggering the assert.
The bug was only noticeable in debug builds.
This patch fixes the problem by making sure that the update code
checks for errors during condition processing and acts accordingly.
2010-07-19 11:03:52 +02:00
Jon Olav Hauglid
52b1e11ee1
merge from mysql-trunk-bugfixing
2010-07-19 10:27:53 +02:00
Davi Arnaut
83c154dc34
Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
...
Post-merge fix: remove leftovers from safemalloc removal.
2010-07-17 11:56:00 -03:00
Andrei Elkin
c225cde943
merging for bug#54935 to trunk-bugfixing
2010-07-17 14:07:36 +03:00
Davi Arnaut
4d532f6ea6
Merge of mysql-trunk-merge into mysql-trunk-bugfixing.
2010-07-16 17:02:40 -03:00
Andrei Elkin
2d91f05e88
bug#54935
...
applying bundle made for next-mr-bugfixing to trunk-bugfixing branch of the bug
2010-07-16 21:25:38 +03:00
Andrei Elkin
48d1c50ac1
bug#54935
...
applying bundle made for next-mr-bugfixing to trunk-bugfixing branch of the bug
2010-07-16 21:25:00 +03:00
Davi Arnaut
7e9f53acdf
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
2010-07-16 15:00:07 -03:00
Davi Arnaut
0b83096be5
Bug#48327: Some crashes specific to FreeBSD ("embedded")
...
Bug#47139: Test "merge" crashes in "embedded" run
Backport patch for Bug#47139
2010-07-16 14:33:35 -03:00
Georgi Kodinov
a95b184630
merge
2010-07-16 18:04:39 +03:00
Marc Alff
2fa98ec48f
Bug#53255 Installed psi headers in wrong directory
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-16 08:43:04 -06:00
Marc Alff
3fa071bbd6
Bug#53392 Tests: perfschema.query_cache fails
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-16 08:28:19 -06:00
Marc Alff
d32d8f8d58
Bug#53394 Tests: perfschema.myisam_file_io fails
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-16 08:21:07 -06:00
Marc Alff
9247f2252b
Bug#54467 performance schema complains of wrong structure in bootstrap mode
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-16 08:01:47 -06:00
Georgi Kodinov
d4931e4beb
Addendum to bug #53814 : test results updates
2010-07-16 16:56:33 +03:00
Marc Alff
ae127ed601
Bug#54782 Performance schema per thread accounting and thread cache
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-16 07:50:50 -06:00
Ramil Kalimullin
2ae6d370a9
Automerge.
2010-07-16 12:43:17 +04:00
Bjorn Munch
17ed4f6880
Bug #54835 MTR version 1 cannot start server - bootstrap reports unknown InnoDB engine
...
Remove --loose-skip-innodb from startup options
This is a simple backport of change done in WL #5349
Same as shown as "temporary fix", cherry picked to -mtr branch
2010-07-16 10:21:06 +02:00
Ramil Kalimullin
a9b8eb4255
Fix for bug #50667 : The InnoDB plugin prevents initialization
...
of the "embedded" server
Problem: mysqltest_embedded failed to load ha_innodb_plugin library
on some platforms (due to some unresolved references).
Fix: on FreeBSD use -export-dynamic flag building mysqltest_embedded.
That allows to use its global symbols to resolve references in the
dynamically loaded plugin library.
2010-07-16 11:15:22 +04:00
Marc Alff
edf7865437
Bug#52134 performance schema file io, symlink in path
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-15 19:25:03 -06:00
Marc Alff
c92a6ea8ea
Bug#53617 Missing performance schema tables not reported in the server log at startup
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-15 19:18:44 -06:00
Marc Alff
772a7172dc
Bug#52502 Performance schema does not start with large mutex_instance buffers
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-15 19:03:08 -06:00
Marc Alff
a809475699
Bug#52586 Misleading error message on attempt to access a P_S table using a wrong name
...
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-15 18:50:39 -06:00
Marc Alff
9f27e28976
Bug#53566 SHOW ENGINE PERFORMANCE_SCHEMA STATUS reports less memory than really used
...
Backporting the fix from myql-next-mr (5.6) to mysql-trunk (5.5)
2010-07-15 18:28:52 -06:00
Marc Alff
f16681d614
Bug#53148 Remove PFS_readonly_table
...
This fix is for cleanup, to resolve a remaining code review item.
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5).
2010-07-15 18:06:33 -06:00
Marc Alff
bb9505ae31
Fixed Copyright headers in storage/perfschema
...
Fixed minor merge issues with #includes
2010-07-15 17:44:45 -06:00
Davi Arnaut
66dd2f49b6
Bug#53613: mysql_upgrade incorrectly revokes ...
...
Post-merge fix: adjust line numbers in pfs_upgrade test case
result given that mysql_system_tables_fix.sql was modified.
2010-07-15 18:57:47 -03:00
Davi Arnaut
125315b4e4
Strip maintainer mode options from the flags written to
...
mysql_config. Those are mainly warning options intended
to monitor the server code and shouldn't be leaked to
client code.
2010-07-15 17:16:24 -03:00
Davi Arnaut
55958d6dac
Bug#42733: Type-punning warnings when compiling MySQL -- strict aliasing violations.
...
Silence bogus aliasing warning through a pointer indirection. Also,
no need to check the return of a placement new.
2010-07-15 16:29:25 -03:00
Davi Arnaut
8fcaea9afb
WL#5486: Remove code for unsupported platforms
...
Restore hack necessary to setup a libmysqld archive.
2010-07-15 15:44:15 -03:00
Davi Arnaut
ef6db3251d
Fix tree name.
2010-07-15 15:05:08 -03:00
Davi Arnaut
0e6fcb393c
Bug#45288: pb2 returns a lot of compilation warnings on linux
...
Fix compiler warnings due to: a mismatch in the prototypes for
check_access and implicit conversions from double to ulonglong
and vice-versa.
2010-07-15 14:45:08 -03:00
Georgi Kodinov
aaf5f8d5c4
merge
2010-07-15 18:46:41 +03:00
Davi Arnaut
649390ac81
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
2010-07-15 10:47:50 -03:00
Alexey Kopytov
06b8897e8e
Automerge.
2010-07-15 17:09:38 +04:00
Alexey Kopytov
0860015560
Manual merge.
2010-07-15 17:01:44 +04:00
Alexey Kopytov
b5f79c395a
Null merge.
2010-07-15 16:39:48 +04:00
Davi Arnaut
8df20918d6
WL#5486: Remove code for unsupported platforms
...
Remove OS/2 specific code.
2010-07-15 08:33:27 -03:00
Davi Arnaut
3c418c5709
WL#5486: Remove code for unsupported platforms
...
Remove QNX specific code.
2010-07-15 08:28:41 -03:00
Davi Arnaut
9f3aa51ba1
WL#5486: Remove code for unsupported platforms
...
Remove VMS specific code.
2010-07-15 08:26:38 -03:00
Davi Arnaut
79dcc17d49
WL#5486: Remove code for unsupported platforms
...
Remove Zortech specific code.
2010-07-15 08:17:56 -03:00
Davi Arnaut
b3d22cef93
WL#5486: Remove code for unsupported platforms
...
Remove MS-DOS specific code.
2010-07-15 08:16:06 -03:00
Davi Arnaut
f54a118249
WL#5486: Remove code for unsupported platforms
...
Remove Netware specific code.
2010-07-15 08:13:30 -03:00
Alexey Kopytov
a42108c291
Backport of the fix for bug#25421 to 5.0.
...
Calculating the estimated number of records for a range scan
may take a significant time, and it was impossible for a user
to interrupt that process by killing the connection or the
query.
Fixed by checking the thread's 'killed' status in
check_quick_keys() and interrupting the calculation process if
it is set to a non-zero value.
2010-07-15 10:10:16 +04:00
Sunny Bains
57b985ab56
Fix bug# 54901 assert during recovery when binlog enabled.
...
Remove the pure attribute from a function. The function doesn't qualify as
a pure function because it has a side-effect (modifies its parameter). Add
a clarifying comment to another function's declaration.
2010-07-15 11:55:15 +10:00
Davi Arnaut
6f6be1e77a
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
2010-07-14 16:42:35 -03:00