gluh@mysql.com/eagle.(none)
658777d808
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/4.1
2007-01-26 16:28:32 +04:00
msvensson@shellback.(none)
2580c49f94
Bug#19209 Test 'rpl_openssl' hangs on Windows
...
- Remove the hack to not run it on windows
2007-01-26 11:34:56 +01:00
msvensson@shellback.(none)
1a3cf64fc9
Bug#25203 Mysql crashes when mysql_kill() is executed in a connection using SSL
...
- It's too early to free the SSL object in 'vio_ssl_close'. There
might still be a thread using or reading from it on platforms
where we need to close the active connection/socket in order
to break the read.
- Add new function 'vio_ssl_delete' and install it as the viodelete
function for SSL connections.
2007-01-26 11:30:54 +01:00
igor@olga.mysql.com
7740b0248e
Post merge fix
2007-01-25 22:50:48 -08:00
igor@olga.mysql.com
19f4fb2b4f
Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug24653
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24653
2007-01-25 21:01:28 -08:00
igor@olga.mysql.com
36df33d80a
Fixed bug #24653 .
...
The bug report has demonstrated the following two problems.
1. If an ORDER/GROUP BY list includes a constant expression being
optimized away and, at the same time, containing single-row
subselects that return more that one row, no error is reported.
Strictly speaking the standard allows to ignore error in this case.
Yet, now a corresponding fatal error is reported in this case.
2. If a query requires sorting by expressions containing single-row
subselects that, however, return more than one row, then the execution
of the query may cause a server crash.
To fix this some code has been added that blocks execution of a subselect
item in case of a fatal error in the method Item_subselect::exec.
2007-01-25 18:44:35 -08:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8
Cleanup of thread-type (linuxthread or NTPL) detection code
...
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-25 20:10:31 +02:00
kroki/tomash@moonlight.home
f4f51a017a
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23527
2007-01-25 20:10:40 +03:00
kroki/tomash@moonlight.home
68a3e96333
BUG#23527: set global query_cache_size can crash the server under
...
high load
MySQL server could crash if two or more threads would initiate query
cache resize at the moments very close in time.
The problem was introduced with the fix of bug 21051 in 5.0 and 5.1:
simultaneous query cache resizes would wait for the first one in
progress, but then each thread would try to finish the operation,
accessing the data that was already reset (attempt to dereference
'bins' pointer, which may be NULL already).
The solution is to check after synchronization if another thread has
done the reset already (test 'query_cache_size > 0' again).
No test case is provided because the bug is a subject to a race.
2007-01-25 20:00:12 +03:00
joerg@trift2.
32e83a6c3d
For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide
...
additional files that specify some actions which are allowed to the MySQL binaries.
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.
This fixes bug#12676.
2007-01-25 17:51:21 +01:00
kaa@polly.local
603475cbf9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-01-25 15:47:19 +03:00
dlenev@mockturtle.local
8b69d169d4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge
2007-01-25 11:26:18 +03:00
df@kahlann.erinye.com
fdd8410e59
BUG#25530 --with-readline fails with commercial source packages
2007-01-25 08:46:07 +01:00
sergefp@mysql.com
4908cf0772
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-25 02:28:53 +03:00
sergefp@mysql.com
39e6de4359
BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...):
...
Fixed typo problem that surfaced after the merge
2007-01-25 02:27:28 +03:00
svoj@mysql.com/april.(none)
de1572d687
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-01-25 01:31:58 +04:00
svoj@mysql.com/april.(none)
ea7fe60fbc
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-01-25 01:26:57 +04:00
sergefp@mysql.com
cced625508
BUG#24127: merge fixes: If subselect is a union, dont allocate several
...
identical pushed_cond_guards arrays. Allocate only one always.
2007-01-24 22:23:50 +03:00
dlenev@mockturtle.local
37110aad7f
Disabling back im_daemon_life_cycle.test, which was temporarily enabled in
...
the team tree for additional investigation.
2007-01-24 22:11:27 +03:00
istruewing@chilla.local
06a8c16f6f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug24607
2007-01-24 17:35:14 +01:00
dlenev@mockturtle.local
c762789096
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge
2007-01-24 19:33:06 +03:00
sergefp@mysql.com
e2f0f4dbd3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-24 19:13:28 +03:00
gluh@mysql.com/eagle.(none)
a7acea61de
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-01-24 19:24:16 +04:00
istruewing@chilla.local
0dc064536f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-24 15:52:19 +01:00
kaa@polly.local
c5a1c578f5
Merge polly.local:/tmp/maint/bug6774/my50-bug6774
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-01-24 17:30:01 +03:00
iggy@recycle.(none)
54ce485557
Merge recycle.(none):/src/bug24496/my50-bug24496
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-24 09:29:50 -05:00
kaa@polly.local
645de0c5d7
Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES"
2007-01-24 16:45:30 +03:00
istruewing@chilla.local
23debf8662
Bug#24607 - MyISAM pointer size determined incorrectly
...
After merge fix
2007-01-24 13:29:46 +01:00
istruewing@chilla.local
050ddb2032
Merge chilla.local:/home/mydev/mysql-4.1-bug24607
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-24 13:26:06 +01:00
istruewing@chilla.local
928d672c46
Bug#24607 - MyISAM pointer size determined incorrectly
...
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
2007-01-24 13:17:01 +01:00
df@kahlann.erinye.com
09add20d4c
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2007-01-24 09:26:08 +01:00
df@kahlann.erinye.com
cb6c5f7ee7
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-24 09:24:52 +01:00
df@kahlann.erinye.com
9665651457
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2007-01-24 09:23:48 +01:00
svoj@mysql.com/june.mysql.com
0e5aa80e8a
After merge fix.
2007-01-24 11:53:09 +04:00
svoj@mysql.com/june.mysql.com
603dcb4d3f
Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
2007-01-24 11:41:13 +04:00
svoj@mysql.com/june.mysql.com
94d834c7b6
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
2007-01-24 11:40:45 +04:00
svoj@mysql.com/june.mysql.com
02212e6ace
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
2007-01-24 11:38:23 +04:00
stewart@willster.(none)
b0d94e9d35
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
2007-01-24 16:24:21 +11:00
stewart@willster.(none)
4889ea2321
fix hpux build problem and some ndb connect errors being missed
2007-01-24 16:12:39 +11:00
tomas@poseidon.mysql.com
292ba83f40
Bug#25668 mysqld may core if cluster disconnected
...
- recommit in 4.1
2007-01-24 09:41:40 +07:00
tomas@poseidon.mysql.com
f869a0d605
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-01-24 09:13:47 +07:00
igor@olga.mysql.com
459f3cf18a
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-23 17:04:01 -08:00
istruewing@chilla.local
26153490ec
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug24607
2007-01-23 22:27:03 +01:00
istruewing@chilla.local
b381fd87bb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-23 20:19:19 +01:00
igor@olga.mysql.com
20279c1a7b
Post-merge fix.
2007-01-23 10:11:53 -08:00
igor@olga.mysql.com
ed3c1741d4
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-23 09:56:06 -08:00
tsmith@quadxeon.mysql.com
52351353f3
Merge bk://localhost:5556
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-01-23 18:46:55 +01:00
tsmith@siva.hindu.god
9d2b85c221
Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target
2007-01-23 10:43:21 -07:00
iggy@recycle.(none)
a0c981d254
Bug#24496:Fresh install of mysql on windows has anonymous user with root access.
...
- Add anonymous user with no rights.
2007-01-23 10:01:56 -05:00
pekka@clam.ndb.mysql.com/clam.(none)
d3462b9af1
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
2007-01-23 15:20:50 +01:00