evgen@moonbone.local
d8e6b38ec1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 23:09:09 +04:00
joerg@trift2.
da80df125a
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-04-07 20:58:01 +02:00
joerg@trift2.
22f066e354
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-04-07 20:46:43 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
1bc1eecd42
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-07 11:37:09 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
2a5bcc3f3e
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-07 11:36:02 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
df913ae06a
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-07 11:35:14 +05:00
kent/kboortz@mysql.com/production.mysql.com
c5fb034464
mysql.spec.sh:
...
Removed man page for "mysql_create_system_tables"
2007-04-07 04:14:44 +02:00
evgen@moonbone.local
c3d9eeb25c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 00:56:35 +04:00
evgen@moonbone.local
93c29c10b1
Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
...
NO_AUTO_VALUE_ON_ZERO mode.
The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.
The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.
2007-04-07 00:13:27 +04:00
tomas@whalegate.ndb.mysql.com
35223ca35c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-06 20:47:28 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d0e79056b1
Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
2007-04-06 18:07:02 +00:00
anozdrin/alik@ibm.
09cfc052f7
Polishing: note added.
2007-04-06 20:21:30 +04:00
anozdrin/alik@ibm.
08b8639361
Polishing: add comments.
2007-04-06 18:56:39 +04:00
msvensson@shellback.(none)
2df8524391
Add "query_sorted" command to mysqltest
...
Usage:
query_sorted <query>;
2007-04-05 20:12:56 +02:00
hhunger@hh-nb.hungers
df469af549
test of row locking.
2007-04-05 16:04:31 +02:00
msvensson@pilot.blaudden
c3dc142df5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-05 13:54:24 +02:00
msvensson@pilot.blaudden
9cd8b2b8fb
Protect against dying twice
...
Cleanup exit handling
2007-04-05 13:53:44 +02:00
tomas@whalegate.ndb.mysql.com
77a1d31fbc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:24:37 +02:00
tomas@whalegate.ndb.mysql.com
a858e44a9d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:20:56 +02:00
mskold/marty@mysql.com/linux.site
bcac914163
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 09:18:37 +02:00
tomas@whalegate.ndb.mysql.com
ffba52433c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 09:18:36 +02:00
tomas@whalegate.ndb.mysql.com
ee57ca9db0
set name for ndb tools
2007-04-05 09:16:16 +02:00
tomas@whalegate.ndb.mysql.com
292929bc26
Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
...
- test case workaround to avoid random failures
2007-04-05 09:12:30 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:39:12 +02:00
kent@mysql.com/kent-amd64.(none)
463b34e77b
zlib.m4:
...
Only require the more recent zlibCompileFlags() when
building the server, client zlib don't need it.
Makefile.am:
Always build the bundled zlib static only
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
make_binary_distribution.sh:
Real "mysqlmanager" executable might be in ".libs"
2007-04-05 08:36:56 +02:00
kent@mysql.com/kent-amd64.(none)
6249bb34a4
Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-build
...
into mysql.com:/home/kent/bk/sotest/mysql-5.0-build
2007-04-05 08:30:49 +02:00
kent@mysql.com/kent-amd64.(none)
8cc67c011e
Deleted reject files accidently checked in
...
configure.in.rej
include/my_global.h.rej
BUILD/SETUP.sh.rej
mysys/thr_alarm.c.rej
include/my_pthread.h.rej
2007-04-05 08:30:16 +02:00
mskold/marty@mysql.com/linux.site
b3ce01771a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:24:03 +02:00
kent@mysql.com/kent-amd64.(none)
7f696378fb
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/sotest/mysql-5.0-build
2007-04-05 08:13:39 +02:00
mskold/marty@mysql.com/linux.site
ee034c0e59
Removed compiler warnings
2007-04-05 07:28:09 +02:00
mskold/marty@mysql.com/linux.site
84eb172c1a
Fixed compilation error on Windows
2007-04-05 06:49:43 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7da27b5b2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
2007-04-05 11:30:19 +08:00
tomas@whalegate.ndb.mysql.com
881fd5319c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-04 23:05:59 +02:00
msvensson@pilot.blaudden
3f365383de
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-04 19:20:14 +02:00
msvensson@pilot.blaudden
c159836fdc
Bug#27344 Total failure to start the server
...
- length($sockdir) >= 80 !!
2007-04-04 19:19:26 +02:00
msvensson@pilot.blaudden
8cd59587d8
Bug#27344 Total failure to start the server
...
- length($sockdir) >= 80 !!
2007-04-04 19:16:09 +02:00
msvensson@pilot.blaudden
678a358746
Skip test cases if the script or binary they need can't be found
2007-04-04 15:40:40 +02:00
msvensson@pilot.blaudden
3b1fc84a5e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-04 15:17:00 +02:00
msvensson@pilot.blaudden
fc992b0667
Add "skip" function, makeing mysqltest return an
...
error code indicating test should be skipped
2007-04-04 15:15:40 +02:00
msvensson@pilot.blaudden
19801cbfdc
Add expansion of $variables in "let from query",
...
"if with query" and "while with query"
2007-04-04 15:09:12 +02:00
mskold/marty@mysql.com/linux.site
625a2629f0
Bug #26242 UPDATE with subquery and triggers failing with cluster tables
...
In certain cases AFTER UPDATE/DELETE triggers on NDB tables that referenced
subject table didn't see the results of operation which caused invocation
of those triggers. In other words AFTER trigger invoked as result of update
(or deletion) of particular row saw version of this row before update (or
deletion).
The problem occured because NDB handler in those cases postponed actual
update/delete operations to be able to perform them later as one batch.
This fix solves the problem by disabling this optimization for particular
operation if subject table has AFTER trigger for this operation defined.
To achieve this we introduce two new flags for handler::extra() method:
HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH.
These are called if there exists AFTER DELETE/UPDATE triggers during a
statement that potentially can generate calls to delete_row()/update_row().
This includes multi_delete/multi_update statements as well as insert statements
that do delete/update as part of an ON DUPLICATE statement.
2007-04-04 12:50:39 +02:00
gkodinov/kgeorge@magare.gmz
204559cd2c
Merge magare.gmz:/home/kgeorge/mysql/work/B27513-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
2007-04-04 13:38:57 +03:00
gkodinov/kgeorge@magare.gmz
b530ae54ee
BUG 27513: fixed left-over sql mode from a test case.
2007-04-04 13:38:19 +03:00
tsmith@quadxeon.mysql.com
ab15c0fb94
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50
2007-04-04 11:06:48 +02:00
msvensson@pilot.blaudden
bc675fb568
Only check for warnings produced by mysqltest if --check-testcases
2007-04-04 10:59:00 +02:00
gkodinov/kgeorge@magare.gmz
41ac6776f5
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
2007-04-04 11:52:53 +03:00
igor@olga.mysql.com
38cf7dee4c
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-03 22:24:57 -07:00
igor@olga.mysql.com
0e14d4c7ed
Improved coverage for the code added to fix bug 27532.
2007-04-03 19:45:37 -07:00
igor@olga.mysql.com
a87e5ac3d5
Fix after manual merge
2007-04-03 17:09:41 -07:00
igor@olga.mysql.com
6aa599fc31
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-03 16:11:27 -07:00