jonas@perch.ndb.mysql.com
0a32761857
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-30 19:45:44 +01:00
jonas@perch.ndb.mysql.com
08d5217056
ndb - interface change of handling of abort option
...
1) move AbortOption from NdbTransaction to NdbOperation
2) let each operation have a "default" abort option dependant on
operation type
- read - AO_IgnoreError
- dml - AbortOnError
- scan take over - AbortOnError
3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.
Another value to execute(AO) is equivalent to setting AO on each operation before calling execute
4) execute() does _only_ return -1 if transaction has been aborted
otherwise, you need to check each operation for error code
2007-01-30 19:45:14 +01:00
jonas@perch.ndb.mysql.com
60d263b92d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-30 19:34:49 +01:00
jonas@perch.ndb.mysql.com
4ffcd999de
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-30 19:33:33 +01:00
jonas@perch.ndb.mysql.com
7d54ea6b49
ndb -
...
remove copy/paste method in NdbIndexOperation
2007-01-30 19:28:32 +01:00
jonas@perch.ndb.mysql.com
3a3ed75655
ndb - minor style fixes
2007-01-30 19:26:40 +01:00
df@kahlann.erinye.com
16865c1ad2
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2007-01-30 18:43:23 +01:00
gkodinov/kgeorge@rakia.gmz
066b2d8151
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B25643-5.0-opt
2007-01-30 19:30:42 +02:00
mhansson/martin@linux-st28.site
d37b840f9a
This is an empty changeset to trigger a rerun of pushbuild.
2007-01-30 18:07:41 +01:00
jani/jamppa@production.mysql.com
0e9a64684d
Merge bk://localhost:5559
...
into production.mysql.com:/usersnfs/jamppa/mysql-4.0
2007-01-30 17:52:27 +01:00
jani@ua141d10.elisa.omakaista.fi
b3523e398c
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-30 18:52:26 +02:00
tomas@poseidon.mysql.com
2ef4c0a2c9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-30 23:10:14 +07:00
gkodinov/kgeorge@macbook.gmz
a7af53838a
Bug #25643 : SEC_TO_TIME function problem
...
Checking for NULL before calling the val_xxx()
methods only checks for such arguments that are
known to be NULLs at compile time.
The arguments that may or may not contain
NULLs (e.g. function calls and possibly others)
are not checked at all.
Fixed by first calling the val_xxx() method and
then checking for null in SEC_TO_TIME().
In addition QUARTER() was not returning 0 (as all the
val_int() functions do when processing a NULL value).
2007-01-30 17:43:34 +02:00
df@kahlann.erinye.com
95275e28f2
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-25530
2007-01-30 13:57:36 +01:00
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
tomas@poseidon.mysql.com
bfb0614175
valgrind leak
...
- no injected events if operation is not connected
- remove extra valgrind checks
2007-01-30 15:43:55 +07:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9755609b7b
Bug#23546, Cluster configured without any arbitration
2007-01-30 13:05:40 +08:00
tomas@poseidon.mysql.com
5f50de1ad0
ndb - added extra valgrind memleak checks to try to track leak
2007-01-30 11:52:37 +07:00
jonas@perch.ndb.mysql.com
0d1f39202d
ndb -
...
two small fixes for TC
1) use static syntax
2) fix attlen handling in unique index
2007-01-30 04:14:07 +01: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
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
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@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
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