msvensson@pilot.mysql.com
8bc890c146
Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 18:52:05 +01:00
istruewing@chilla.local
42bd03e254
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-01-29 18:47:46 +01:00
msvensson@pilot.mysql.com
26e4f2e506
Bug#25417 "/usr/bin/test" installed from yassl/taocrypt/test
...
- It's good to build the test programs for yaSSL to check for undefined
symbols etc but they should not be installed by "make install"
2007-01-29 18:46:06 +01:00
msvensson@pilot.mysql.com
d87ccc0c83
Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 18:38:12 +01:00
msvensson@neptunus.(none)
8c142aef3f
Add test for making sure there are no spurious connect failures when using SSL
2007-01-29 18:32:45 +01:00
mtaylor@qualinost.(none)
d394d66d28
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-29 12:28:25 -05:00
mtaylor@qualinost.(none)
fe308d8d63
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2007-01-29 12:26:43 -05:00
msvensson@pilot.mysql.com
f73164bdfc
Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 17:55:38 +01:00
istruewing@chilla.local
79e099e8a6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-01-29 17:20:18 +01:00
msvensson@pilot.mysql.com
180b0e0ab5
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-01-29 17:19:38 +01:00
msvensson@neptunus.(none)
751d00c47e
Import latest version of yaSSL
...
- Replace SawTooth copyright header with MySQL's
- Bug#19209 Test 'rpl_openssl' hangs on Windows
- Spurious "2013 Connection to server lost" errors fixed
yaSSL doesn't close socket anymore, that is left to the application
2007-01-29 16:54:40 +01:00
msvensson@pilot.mysql.com
5c717b080f
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-01-29 16:19:59 +01:00
msvensson@pilot.mysql.com
07df8fd469
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 16:12:12 +01:00
msvensson@pilot.mysql.com
007d170ad2
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
2007-01-29 14:33:53 +01:00
msvensson@pilot.mysql.com
7eaa82ea38
Bug#22943 syscall pruning in libmysql
...
- Set the timeout values only where needed
2007-01-29 14:31:48 +01:00
msvensson@pilot.mysql.com
84947802c1
Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 12:27:11 +01:00
msvensson@pilot.mysql.com
d42b919a0b
Bug#19474 readline bug: mysql: free(): invalid pointer
...
- Write to uninitialised memory occured since _rl_rapped_lines buffer
was not extended in CHECK_INV_LBREAKS macro
- Patch submitted to bug-readline@gnu.org
2007-01-29 12:24:08 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
e3f4f02b64
bug #25492 (Invalid deallocation in mysql_stmt_fetch)
...
Operating with the prepared statements we don't alloc MYSQL_DATA structure,
but use MYSQL_STMT's field instead (to increase performance by reducing
malloc calls).
So we shouldn't free this structure as we did before.
2007-01-29 11:48:31 +04:00
igor@olga.mysql.com
e897780919
Fixed bug #24420 .
...
Objects of the classes Item_func_is_not_null_test and Item_func_trig_cond
must be transparent for the method Item::split_sum_func2 as these classes
are pure helpers. It means that the method Item::split_sum_func2 should
look at those objects as at pure wrappers.
2007-01-26 17:10:45 -08:00
mtaylor@qualinost.(none)
f8f11eb2d9
Reverting change adding /etc/mysql support, as it breaks some installs.
2007-01-26 12:17:50 -08:00
mtaylor@qualinost.(none)
065ab1537a
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-26 12:13:59 -08:00
mtaylor@qualinost.(none)
58ae89cb76
User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.
2007-01-26 12:00:38 -08:00
cmiller@zippy.cornsilk.net
f74992258a
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-26 14:47:35 -05:00
cmiller@zippy.cornsilk.net
41179e6a8f
Bug #25879 : THD::options isn't set with ulonglong values and \
...
variables
Bits higher than 2**31 were impossible to set on THD::options. It's
probably a remnant from a time when options was a 32-bit integer.
Now, use unsigned long-long constants and variables to set and clear
THD::options.
---
Pulled comments back to column 49.
2007-01-26 14:47:12 -05:00
igor@olga.mysql.com
1ad63bdfec
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24653
2007-01-26 09:33:19 -08:00
gluh@mysql.com/eagle.(none)
45f61a06fb
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2007-01-26 16:36:50 +04:00
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
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