Commit graph

74552 commits

Author SHA1 Message Date
Vladislav Vaintroub
2a5d8ea9a2 Added copiright, some more comments 2012-02-17 23:27:15 +01:00
Vladislav Vaintroub
b932e57b27 Store callback instance in the connection structure, to call CallbackMayRunLong on long
waits (currently binlog only)

Also add copyright notice.
2012-02-17 23:23:54 +01:00
Vladislav Vaintroub
e0a500eba3 fix windows embedded (default thread handling ==pool-of-threads does not work in embedded) 2012-02-17 03:34:33 +01:00
Vladislav Vaintroub
dabb963934 use poof-of-threads as default for thread_handling on Windows 2012-02-16 21:07:22 +01:00
Vladislav Vaintroub
3fde590805 Only synchronous disk reads should use thd_wait_begin with THD_WAIT_DISKIO 2012-02-16 18:12:40 +01:00
Vladislav Vaintroub
02724621ca merge from 5.5 2012-02-16 17:33:37 +01:00
Vladislav Vaintroub
cfa56f900a address second round review comments 2012-02-16 16:59:04 +01:00
Sergei Golubchik
0d0e68da6a merge 2012-02-15 19:11:16 +01:00
Sergei Golubchik
25609313ff 5.3.4 merge 2012-02-15 18:08:08 +01:00
unknown
13113c9e1a Fix wrong type causing build failure on windows. 2012-02-15 17:09:56 +01:00
unknown
db4b6aa3ae Fix wrong type causing build failure on windows. 2012-02-15 16:38:38 +01:00
unknown
4917073305 Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5. 2012-02-15 15:37:38 +01:00
unknown
452a59e09c Updated with XtraDB from Percona Server 5.5.20-24.1
Files copied from Percona-Server-5.5.20-rel24.1.tar.gz source tarball.
2012-02-15 11:49:53 +01:00
unknown
47a54a2e08 Merge MySQL 5.5.20 into MariaDB 5.5. 2012-02-14 16:06:41 +01:00
unknown
764eeeee74 Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupal
Problem was that now we can merge derived table (subquery in the FROM clause).
Fix: in case of detected conflict and presence of derived table "over" the table which cased the conflict - try materialization strategy.
2012-02-14 16:52:56 +02:00
unknown
bbd20403c5 Fix wrong error code in the test case.
The replication slave sets first error 1913 and immediately after error
1595. Thus it is possible, but unlikely, to get 1913. The original test
seems to realise this, but uses an invalid error code - my guess is
that this was a temporary code used in a feature tree, which was then
forgotten to be fixed when merged to main. The removed "1923" is
something committed by mistake during tests.
2012-02-14 13:24:03 +01:00
Alexey Botchkov
7ab53e8062 MDEV-59 Review and push crashsafe GIS keys.
tests for RTree keys recovery.
2012-02-14 16:04:06 +04:00
Sergey Petrunya
e41e56ae99 Merge fix for BUG#928048 2012-02-14 14:13:10 +04:00
Sergey Petrunya
c9355dc279 BUG#928048: Query containing IN subquery with OR in the where clause returns a wrong result
- Make equality propagation work correctly when done inside the OR branches
2012-02-14 13:58:57 +04:00
Igor Babaev
c8bbe06ac7 Fixed LP bug #925985.
If the flag 'optimize_join_buffer_size' is set to 'off' and the value
of the system variable 'join_buffer_size' is greater than the value of
the system variable 'join_buffer_space_limit' than no join cache can
be employed to join tables of the executed query.
A bug in the function JOIN_CACHE::alloc_buffer allowed to use join
buffer even in this case while another bug in the function 
revise_cache_usage could cause a crash of the server in this case if the
chosen execution plan for the query contained outer join or semi-join
operation.
2012-02-13 23:46:57 -08:00
unknown
27dfa45e70 When we fail during slave thread initialisation, keep mi->run_lock
locked until we have finished clean up.

Previously, the code released the lock without marking that the thread
was running. This allowed a new slave thread to start while the old one
was still in the middle of cleaning up, causing assertions and probably
general mayhem.
2012-02-13 17:14:10 +01:00
Vladislav Vaintroub
e2deff6f02 merge 2012-02-12 23:03:36 +01:00
Vladislav Vaintroub
0c265a5eb8 Use newly released HeidiSQL 7.0 in the MSI installer 2012-02-12 23:02:56 +01:00
Vladislav Vaintroub
e777a6cc57 merge 2012-02-11 15:05:07 +01:00
Vladislav Vaintroub
941572137c merge 2012-02-11 15:00:15 +01:00
Vladislav Vaintroub
e2cb03c980 Fix for MDEV-140, LPBug#930145 - broken SSL connectivity for some connectors 2012-02-11 14:57:44 +01:00
unknown
bc2c40e71b Fix _another_ race in test case rpl_cant_read_event_incident (seen in 5.5 Buildbot). 2012-02-11 13:32:36 +01:00
Vladislav Vaintroub
b3e15f8389 A recent change in the server protocol code broke SSL connection for some client libraries.
Protocol documentation (http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol)
says that initial packet sent by client if client wants SSL, consists of client capability flags only
(4 bytes or 2 bytes edependent on protocol versionl). 
Some clients happen to send more in the initial SSL packet (C client, Python connector), while others (Java, .NET) follow the docs and send only client capability flags.

A change that broke Java client was a newly introduced check that frst client packet
has 32 or more bytes. This is generally wrong, if client capability flags contains CLIENT_SSL.

Also, fixed the code such that read max client packet size and charset in the first packet prior to SSL handshake.  With SSL, clients do not have to send this info, they can only send client flags.

This is now fixed such that max packet size and charset are not read prior to SSL handshake, in case of SSL they are read from the "complete" client authentication packet after SSL initialization.
2012-02-11 03:25:49 +01:00
unknown
4360bd8094 Merge fix for lp:910817: Race condition in kill_threads_for_user(). 2012-02-10 22:09:57 +01:00
unknown
0e6dd6713c Merge fix for lp:910817: Race condition in kill_threads_for_user(). 2012-02-10 21:58:39 +01:00
Michael Widenius
6fa209f7ad Automatic merge 2012-02-10 22:56:34 +02:00
Michael Widenius
ea45d770af Fixed that prepared statements are properly igored (if possible) by query cache. 2012-02-10 22:53:46 +02:00
unknown
e76a0476cc Merge fix for lp:910817: Race condition in kill_threads_for_user(). 2012-02-10 21:20:32 +01:00
unknown
3d61c1399d lp:910817: Race condition in kill_threads_for_user()
The code was accessing a pointer in a mem_root that might be freed by
another concurrent thread. Fix by moving the access to be done while the
LOCK_thd_data is held, preventing the memory from being freed too early.
2012-02-10 21:19:12 +01:00
unknown
804c69ab83 Fix set_limit to be uniform with all calls.
Fix of set_limit in case of an error (actually impossible case but better it will be right)
2012-02-10 16:23:18 +02:00
unknown
f6cdddf51f Test case for bug lp:905353
The bug itself is fixed by the patch for bug lp:908269.
2012-02-09 23:35:26 +02:00
unknown
6e9b06d90b Fix a number of problems in the test suite (no code bugs):
- mysql-test-run.pl --valgrind complains when all tests succeed.

 - perfschema.all_instances fail on non-linux, where ENABLE_TEMP_POOL
   is not set and therefore BITMAP mutex is not used.

 - MDEV-132: main.mysqldump fails because it depends on exact size of stdio
   buffers.

 - MDEV-99: rpl.rpl_cant_read_event_incident fails due to a race where the
   slave manages to connect while the test case is in the middle of setting up
   the master, causing the slave to replicate extra/wrong events.

 - MDEV-133: rpl.rpl_rotate_purge_deadlock fails because it issues a
   DEBUG_SYNC SIGNAL immediately followed by RESET; this means that sometimes
   the intended receipient has no time to see the signal before it is cleared
   by the RESET, causing wait to timeout.
2012-02-09 13:10:47 +01:00
unknown
a03d846576 Fix memory leak when one +O debug on top of another. 2012-02-08 21:55:40 +01:00
Vladislav Vaintroub
8877fe7359 merge 2012-02-08 11:18:55 +01:00
unknown
9f9ecc0626 MDEV-135: work-around a GCC bug seen on Debian 5 "lenny" 64-bit. 2012-02-06 13:30:39 +01:00
Igor Babaev
3efc8d016f Made mrr related counters temporarily invisible until we agree upon their names. 2012-02-03 12:49:17 -08:00
Vladislav Vaintroub
7232151193 Add SET_TARGET_PROPERTIES(ENABLE_EXPORTS) for mysqltest so plugins.dialog
test passes.
2012-02-03 21:15:08 +01:00
Vladislav Vaintroub
5d3efeba4a merge 2012-02-03 17:02:02 +01:00
unknown
74b61f845b Fixed typos in Query Cache. 2012-02-03 16:56:12 +02:00
unknown
f5c8749a47 Merge with 5.2 2012-02-03 13:32:29 +02:00
unknown
79a04a2c9c Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. 2012-02-03 13:01:05 +02:00
Vladislav Vaintroub
24e7faa54f Various fixes for Solaris compiler.
Also, restrict symbol visibility in statically
built plugins, to minimize the chance for symbol 
name clashes with dynamic plugins.
2012-02-03 11:46:40 +01:00
unknown
52d4103ccc Fixed DELETE issues of view over view over table. 2012-02-03 12:24:55 +02:00
Sergei Golubchik
892cd36992 make pam plugin to build in 5.5.
fix pam.tets for 5.5
2012-02-03 10:31:39 +01:00
Igor Babaev
046988661d Back-ported the fix for bug #12831587 from mysql-5.6 code line.
The comment for the fix commit says:
Due to the changes required by ICP we first copy a row from the InnoDB
format to the MySQL row buffer and then copy it to the pre-fetch queue.
This was done for the non-ICP code path too. This change removes the
double copy for the latter.
2012-02-03 00:46:34 -08:00