mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
66068 commits 2781 branches 343 tags 1.6 GiB
Commit graph

66068 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Davi Arnaut
6f6be1e77a Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-14 16:42:35 -03:00
Davi Arnaut
d5e8508f90 Bug#42733: Type-punning warnings when compiling MySQL -- 
strict aliasing violations.

Post-merge fix: include my_compiler.h before my_attribute.h
as the latter will undef __attribute__ if the compiler is not
GCC. Based on the compiler version, in my_compiler.h we know
for sure whether the aligned attribute is supported. Furthermore,
undefining attribute might cause bugs if some system header
uses it.
 2010-07-14 16:39:40 -03:00
Marc Alff
508522e5f7 Implemented code review comments. 
Fixed style according to the specific innodb style, for innodb code.
 2010-07-14 10:23:21 -06:00
Marc Alff
adf29ed689 local merge 2010-07-14 09:57:50 -06:00
Marc Alff
805854ca16 local merge 2010-07-14 09:53:44 -06:00
Davi Arnaut
e29211c366 Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-14 11:12:26 -03:00
Davi Arnaut
dbf41f9fbc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-14 10:16:10 -03:00
Davi Arnaut
dbef812ab9 Bug#48327: Some crashes specific to FreeBSD ("embedded") 
Backport fixes from ndb: Rework the constructors of some static
object's to not call dbug functions since the constructors will
be called before main, and consequently, before the dbug library
is initialized.
 2010-07-14 10:10:12 -03:00
Davi Arnaut
21f63caf8e Bug#42733: Type-punning warnings when compiling MySQL -- 
strict aliasing violations.

Another rather noisy violation of strict aliasing rules
is the spatial code which makes use of stack-based memory
(of type Geometry_buffer) to provide placement for Geometry
objects. Although a placement new is allowed to dynamically
change the type of a object, the object returned by the
new placement was being ignored and the original stack-based
object was being casted to the new type, thus violating strict
aliasing rules.

The solution is to reorganize the code so that the object
returned by the new placement is used instead of casting the
original object. Also, to ensure that the stack-based object
is properly aligned with respect to the objects it provides
placement for, a set of compiler-dependent macros and types
are introduced so that the alignment of objects can be inquired
and specified.
 2010-07-14 09:27:13 -03:00
Georgi Kodinov
a1414d519f merge 2010-07-14 15:05:20 +03:00