Commit graph

35039 commits

Author SHA1 Message Date
igor@olga.mysql.com
0cc8643cac Adjusted results after fix for bug 25971. 2007-02-16 14:30:25 -08:00
malff/marcsql@weblab.(none)
0bf1b708f3 Manual merge 2007-02-16 13:42:52 -07:00
igor@olga.mysql.com
f5888a8d10 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.0-opt
2007-02-16 09:39:08 -08:00
jonas@perch.ndb.mysql.com
676647ad86 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-02-16 18:22:52 +01:00
jonas@perch.ndb.mysql.com
80b82d2bbd ndb - bug in my.cnf handling on resize of vector
backport fix from 5.1
2007-02-16 18:20:24 +01:00
jonas@perch.ndb.mysql.com
82d2c91f1f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-02-16 18:15:10 +01:00
jonas@perch.ndb.mysql.com
33e96dc5af Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-02-16 18:11:40 +01:00
jonas@perch.ndb.mysql.com
77b8feb878 ndb - bug#26454
make lockpages=1 run a bit earlier in startup
2007-02-16 18:10:27 +01:00
evgen@moonbone.local
31d63b7971 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/16630-bug-5.0-opt-mysql
2007-02-16 19:44:54 +03:00
evgen@moonbone.local
7916d9e965 Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
UPDATE contains wrong data if the SELECT employs a temporary table.

If the UPDATE values of the INSERT .. SELECT .. ON DUPLICATE KEY UPDATE
statement contains fields from the SELECT part and the select employs a
temporary table then those fields will contain wrong values because they
aren't corrected to get data from the temporary table.

The solution is to add these fields to the selects all_fields list,
to store pointers to those fields in the selects ref_pointer_array and
to access them via Item_ref objects.

The substitution for Item_ref objects is done in the new function called 
Item_field::update_value_transformer(). It is called through the
item->transform() mechanism at the end of the select_insert::prepare()
function.
2007-02-16 19:39:28 +03:00
malff/marcsql@weblab.(none)
f8839a70bd Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-02-16 09:02:02 -07:00
joerg@trift2.
0cdbda1273 include/config-win.h :
Companion change to this one
   ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
     include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
2007-02-16 16:31:31 +01:00
tomas@poseidon.mysql.com
9defcbbff4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-16 20:07:05 +07:00
istruewing@chilla.local
97c6a6c4e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-16 10:39:45 +01:00
guilhem@gbichot3.local
2f75c9cd69 Backport from the Falcon tree.
When opening/creating the transaction coordinator's log, if binlog is
used, the tc log is the binlog so we use the binlog's name; otherwise
we use the mmap-based log, named after the mandatory argument of the
--log-tc option (meant for that).
2007-02-15 15:50:56 +01:00
guilhem@gbichot3.local
8b1609a637 Fix for BUG#25507 "multi-row insert delayed + auto increment causes
duplicate key entries on slave" (two concurrrent connections doing
multi-row INSERT DELAYED to insert into an auto_increment column,
caused replication slave to stop with "duplicate key error" (and
binlog was wrong)), and BUG#26116 "If multi-row INSERT
DELAYED has errors, statement-based binlogging breaks" (the binlog
was not accounting for all rows inserted, or slave could stop).
The fix is that: if (statement-based) binlogging is on, a multi-row
INSERT DELAYED is silently converted to a non-delayed INSERT.
Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
so it is tested only in the changeset for 5.1. However, BUG#26116
is tested here, and the fix for BUG#25507 is the same code change.
2007-02-15 15:39:03 +01:00
joerg@trift2.
8ddb3af50c Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-02-15 13:46:54 +01:00
igor@olga.mysql.com
a2d4a042d0 Fixed bug #25971: indexes on text columns were ignored when ref accesses
were evaluated.
According to the new rules for string comparison partial indexes on text
columns can be used in the same cases when partial indexes on varchar
columns can be used.
2007-02-14 22:06:41 -08:00
gkodinov/kgeorge@macbook.gmz
664f24d5c3 Bug#19717: The blackhole engine is returning an OK flag in
index_read(), whereas it must return HA_ERR_END_OF_FILE
instead (as there are by definition no rows in a table of 
that engine.
2007-02-14 18:35:59 +02:00
cmiller@zippy.cornsilk.net
154f7f396e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-02-14 10:47:39 -05:00
istruewing@chilla.local
f9e9bd9a0c Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-14 12:03:47 +01:00
istruewing@chilla.local
aba12aca0f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-14 12:02:58 +01:00
stewart@willster.(none)
836c2ab9ae Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge
2007-02-14 21:36:12 +11:00
tomas@poseidon.mysql.com
92f9a37dc1 ndb_config_4_node.ini, ndb_config_1_node.ini:
new file
2007-02-14 15:33:48 +07:00
tomas@poseidon.mysql.com
f92d3b3ab5 backport some mysql-test ndbcluster things from 5.1
remove compiler warning EventLogger.cpp
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc
2007-02-14 15:26:06 +07:00
tomas@poseidon.mysql.com
b7c3aeae2c Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-14 15:18:15 +07:00
tomas@poseidon.mysql.com
120eaec17c Bug #21033 Error 0 in readAutoIncrementValue()
- do not call function if table has no autoincrement
2007-02-14 15:16:26 +07:00
stewart@willster.(none)
6f91941384 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge
2007-02-14 17:09:43 +11:00
stewart@willster.(none)
7ed1f6ac01 BUG#26358 remove unused and non-working SET_VAR_REQ/CONF signals
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing

Remove the dead SET_VAR_REQ,REF,CONF signals.

They:
a) don't currently work
b) will cause confusion with future mgmd updates for
   signal interface to configuration things (e.g. port numbers)
2007-02-14 16:03:25 +11:00
stewart@willster.(none)
e1b75c1784 BUG#26357 remove unused GSN_STATISTICS_REQ and CONF
remove GSN_STATISTICS_REQ and CONF

These are unused and have been since BK import. not needed.
2007-02-14 15:55:08 +11:00
stewart@willster.(none)
5c756c1822 BUG#26356 uninitialised data sent from TAMPER_ORD to DIHNDBTAMPER
Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER

Even though this data is unused from the CMVMI (mgmd) signal,
we shouldn't be doing stuff with uninited data.
2007-02-14 15:51:16 +11:00
stewart@willster.(none)
2fb873f371 BUG#26355 FIXME: use constant for max loglevel in ndb_mgmd 2007-02-14 15:47:34 +11:00
stewart@willster.(none)
02c847eb03 BUG#26353 remove GET_CONFIG_BACKWARDS_COMPAT from ndb_mgmd
there is backwards compatibility for GET CONFIG style configuration requests in
ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
5.0 or 5.1 cluster. remove the backwards compat

remove it
2007-02-14 15:35:29 +11:00
stewart@willster.(none)
faec3f4fb1 BUG#26352 unused ndb_mgm_rep_command in mgmapi.cpp 2007-02-14 15:28:04 +11:00
tomas@poseidon.mysql.com
f45ac96b2a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-14 11:24:35 +07:00
stewart@willster.(none)
2805c8352a WL#3704 mgmapi timeouts (and cleanups)
indicate units in SocketOutputStream timeout

rename timeout in SocketOutputStream to reflect units (ms)

In 5.0 as well as is safe cleanup patch that will help with merging.
2007-02-14 15:22:03 +11:00
tomas@poseidon.mysql.com
bfdb8af26d Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-14 11:17:35 +07:00
tomas@poseidon.mysql.com
1254253640 make sure some printouts in ndbd out file is done with g_eventLogger 2007-02-14 11:16:10 +07:00
tomas@poseidon.mysql.com
0a4505199c Bug#26293 cluster mgmt node sometimes doesn't receive events from all nodes on restart
- signals where sometimes sent too early when setting up subscriptions
2007-02-14 11:05:38 +07:00
igor@olga.mysql.com
c84ee7079c Post-merge fix 2007-02-13 15:49:42 -08:00
ibabaev@bk-internal.mysql.com
266300142e Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-02-13 23:35:06 +01:00
cmiller@zippy.cornsilk.net
9e9dd4327c Bug#25807: LOAD DATA INFILE does not work with Pipes
Showstopper and regression against 5.0.24.

Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail.  Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.

This restores the behavior for file-ish objects that could never be 
seek()ed.
2007-02-13 16:35:29 -05:00
ibabaev@bk-internal.mysql.com
cf9aca84b3 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
2007-02-13 21:25:22 +01:00
cmiller@zippy.cornsilk.net
11e8f48734 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-02-13 10:54:04 -05:00
cmiller@zippy.cornsilk.net
6473de8db1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-02-13 10:02:00 -05:00
msvensson@pilot.mysql.com
7dcdbdf37b Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 10:00:53 +01:00
msvensson@pilot.mysql.com
818cb094fc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 09:56:56 +01:00
igor@olga.mysql.com
0461228a70 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209
2007-02-12 23:10:33 -08:00
holyfoot/hf@mysql.com/hfmain.(none)
30614d22c1 Merge mysql.com:/home/hf/work/20691/my50-20691
into  mysql.com:/home/hf/work/25492/my50-25492
2007-02-13 01:23:23 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
fb4ad23994 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/25492/my50-25492
2007-02-13 01:20:02 +04:00