mskold/marty@linux.site
201705a4b4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-01-31 22:58:03 +01:00
mskold/marty@linux.site
4cc8da4d39
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-01-31 22:43:24 +01:00
mskold/marty@mysql.com/linux.site
5cd40ad30b
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached
2007-01-31 22:38:06 +01:00
tomas@poseidon.mysql.com
1ce3dc9636
Bug#25239 Out of memory problem can cause crash in SUMA
2007-01-31 13:01:03 +07:00
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
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
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
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
jonas@perch.ndb.mysql.com
3f2a9eeba2
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-28 22:03:42 +01:00
jonas@perch.ndb.mysql.com
6b738220d9
ndb - Fix so that node version is recomputed at node failure
2007-01-28 21:56:17 +01:00
gluh@eagle.(none)
30d927dab9
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2007-01-26 16:46:40 +04:00
gluh@eagle.(none)
67db27537b
Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2007-01-26 16:46:01 +04: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
dlenev@mockturtle.local
4fd3b03e71
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 21:55:44 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
70a74003fc
Raise version number after cloning 5.1.15-beta
2007-01-25 18:19:49 +01:00
jani/jamppa@bk-internal.mysql.com
181865cac3
SETUP.sh:
...
Don't use -Wshadow by default yet
2007-01-25 13:12:02 +01:00
dlenev@mockturtle.local
631d3c9c1f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 14:58:45 +03:00
jani/jamppa@bk-internal.mysql.com
031c729eca
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new-ndb
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-01-25 12:38:35 +01:00
jani/jamppa@bk-internal.mysql.com
dd6292d6d1
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-01-25 12:28:00 +01:00
tomas@poseidon.mysql.com
44c483cdda
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-25 18:14:51 +07:00
dlenev@mockturtle.local
3a4ae93a4f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 12:40:11 +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
dlenev@mockturtle.local
c06a385916
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 11:26:07 +03:00
sergefp@mysql.com
8a3592d4e2
BUG#24127: merge: update tests results
2007-01-25 10:00:09 +03:00
tomas@poseidon.mysql.com
6c03020b01
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-25 11:21:04 +07:00
tomas@poseidon.mysql.com
46bcfff2a5
ndb:
...
- added extra cluster connect inicator bit for better handeling of delacation of event operations on cluster disconnect
- added extra assert to try to track down valgrind issue
2007-01-25 11:17:51 +07:00
sergefp@pylon.mylan
cec2e8a66e
Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12
...
into mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
2007-01-25 02:30:36 +03: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@april.(none)
f05c519a6b
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:51:13 +04:00
svoj@april.(none)
3efc296508
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:44:30 +04:00
malff/marcsql@weblab.(none)
a97b3d374d
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
2007-01-24 14:43:09 -07:00
malff/marcsql@weblab.(none)
3ae384d04f
Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected)
...
The build scripts in general, using automake, autoconf, etc, contain several
special commands and work around all related to the way the bison code in the
parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over
time during development, ultimately cause the build scripts to be unstable
and cause build defects by not enforcing dependencies.
This fix simplifies the build process and aligns it with the automake tooling,
which provides native support for bison and *.yy files.
In particular, the following problem have been fixed:
- dependencies with sql_yacc.cc were not honored (Bug 21029), leading to
corrupted builds,
- the work around introduced by Bug 24557, to cleanup the generated files
sql_yacc.h and sql_yacc.cc, has been removed,
- the generated makefile, in a source distribution, used to destroy the files
sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed:
these files are now removed by make maintainer-clean.
- The root cause of the problem found with gcc 4.1 (see Bug 24619) has been
clearly documented, and the "sed" hack has been replaced by a cleaner
work around, when building the code with bison 1.875.
- Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident.
- Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since
the compiling option DBUG_OFF takes precedence when setting YYDEBUG.
2007-01-24 14:40:39 -07: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@pylon.mylan
5bc7d596cc
Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12
...
into mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
2007-01-24 22:28:28 +03: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
81c908f200
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 22:15:14 +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
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
dlenev@mockturtle.local
86f36eb089
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 19:26: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@eagle.(none)
0e949c6ada
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-24 20:12:32 +04:00
gluh@mysql.com/eagle.(none)
a548a54c61
after merge fix
2007-01-24 20:11:36 +04:00