df@kahlann.erinye.com
455b903f28
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-25530
2007-01-30 13:53:48 +01:00
monty@mysql.com/narttu.mysql.fi
25e481aed8
Fixed problems detected by pushbuild
2007-01-30 13:52:26 +02:00
brian@zim.(none)
8ac1d06728
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-29 13:19:51 -08:00
brian@zim.(none)
9fc89facca
Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached.
2007-01-29 13:17:30 -08:00
msvensson@pilot.mysql.com
72689aad2b
Merge 192.168.0.10:mysql/mysql-5.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-29 19:46:00 +01:00
msvensson@neptunus.(none)
adf20e3512
Bug#22579 use --warning-mode=pedantic and -std=c89 flags when compiling with gcc
...
- Reorganize include file order to avoid problem with gcc 2.95.3
- Compiler is confused by forward class declarations
2007-01-29 19:36:48 +01:00
msvensson@pilot.mysql.com
f3add981bc
Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 19:15:26 +01:00
msvensson@pilot.mysql.com
ac10ad6bdb
Merge 192.168.0.10:mysql/yassl_import/my51-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/work/my51-work
2007-01-29 19:15:25 +01:00
msvensson@pilot.mysql.com
a6fb89a704
Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/work/my50-work
2007-01-29 19:12:22 +01:00
msvensson@neptunus.(none)
d52aee0c43
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2007-01-29 19:11:59 +01:00
msvensson@neptunus.(none)
d1a7949297
Add result file for ssl_connect.test
2007-01-29 19:09:30 +01:00
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
msvensson@pilot.mysql.com
544c19b3e6
Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work
...
into pilot.mysql.com:/home/msvensson/mysql/work/my51-work
2007-01-29 18:48:20 +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
a7659cf5c7
Merge 192.168.0.10:mysql/yassl_import/my51-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-29 18:40:22 +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)
03b346fce3
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2007-01-29 18:33:23 +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)
c4db290104
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-29 12:30:48 -05: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
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
msvensson@neptunus.(none)
7a8334edfb
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2007-01-29 17:54:41 +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@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
mhansson/martin@linux-st28.site
3aad724315
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/5.1o-bug20604-tp
2007-01-29 16:16:20 +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
388e846499
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-29 16:11:31 +01:00
df@kahlann.erinye.com
8fa8c6f46b
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-opt
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
2007-01-29 15:35:20 +01:00
df@kahlann.erinye.com
db86c6036b
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1.15-release
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
2007-01-29 15:33:19 +01:00
monty@mysql.com/narttu.mysql.fi
1f6d91c5a6
after merge fixes
...
Removed
2007-01-29 16:13:18 +02:00
mhansson/martin@linux-st28.site
6d7a609742
BUG#20604: FORCE INDEX uses keys disabled by ALTER TABLE
...
The function that checks whether we can use keys for aggregates,
find_key_for_maxmin(), assumes that keys disabled by ALTER TABLE
... DISABLE KEYS are not in the set table->keys_in_use_for_query.
I.E., if a key is in this set, the optimizer assumes it is free to
use it.
The bug is that keys disabled with ALTER TABLE ... DISABLE KEYS still
appear in table->keys_in_use_for_query When the TABLE object has been
initialized with setup_tables(). Before setup_tables is called, however,
keys that are disabled in the aforementioned way are not included in
TABLE::keys_in_use_for_query.
The provided patch changes the code that updates keys_is_use_for_query so
that it assumes that keys_is_use_for_query already takes into account all
disabled keys, and generally all keys that should be used by the query.
2007-01-29 15:07:11 +01:00
df@kahlann.erinye.com
7ce0bd7a5e
apply holyfoot's patch for BUG#25895
2007-01-29 14:47:38 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
6391613d32
bug #25895 (compiling the embedded server fails on some 64-bit platforms)
...
it can't be compile everywhere if we just cast pointer to pthread_t
So now we use correct pthread_self() value as the pthread_t and
pointer where we need to identify the thread exactly.
2007-01-29 17:39:28 +04:00
msvensson@pilot.mysql.com
719a8f5896
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
2007-01-29 14:35:09 +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
holyfoot/hf@mysql.com/hfmain.(none)
6679490dc6
bug #25890 (mysqltest_embedded crashes on start)
...
binlog_filter and rpl_filter are initialized in server's 'main' function
which doesn't work in the embedded server. So this code moved to
function working in both cases.
2007-01-29 15:26:27 +04:00
msvensson@pilot.mysql.com
3bc4d45e29
Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474
...
into pilot.mysql.com:/home/msvensson/mysql/bug19474/my51-bug19474
2007-01-29 12:24:49 +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
monty@narttu.mysql.fi
bb464613ce
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-29 01:57:07 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72
After merge fixes
...
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
2007-01-29 01:47:35 +02:00
baker@bk-internal.mysql.com
bf7efc3ce3
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-28 00:48:11 +01:00
df@kahlann.erinye.com
eadd2c4eef
Build fix for sunfire100b. This can go when BUG#14420 is fixed.
2007-01-27 22:07:52 +01:00
df@kahlann.erinye.com
a4208cdc1c
BUG#25890 put previous fix in better place
2007-01-27 21:26:28 +01:00
df@kahlann.erinye.com
26c6d2d231
BUG#25895 compiling the server with embedded fails on several 64-bit platforms
...
temporary fix
2007-01-27 20:16:15 +01:00
df@kahlann.erinye.com
508d7da976
BUG#25890 mysqltest_embedded crashes on start
...
very temporary fix
2007-01-27 13:12:59 +01:00
df@kahlann.erinye.com
199f7b46b6
fix order in spec file changelog
2007-01-27 12:46:20 +01:00
monty@narttu.mysql.fi
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00