Commit graph

42445 commits

Author SHA1 Message Date
acurtis/antony@ltamd64.xiphis.org
37f76ab496 Merge xiphis.org:/home/antony/work2/p1-bug25396.4
into  xiphis.org:/home/antony/work2/p1-bug25396.5
2007-01-23 08:34:50 -08:00
istruewing@chilla.local
45178e6677 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-23 15:59:49 +01:00
pekka@clam.ndb.mysql.com/clam.(none)
d3462b9af1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
2007-01-23 15:20:50 +01:00
pekka@clam.(none)
f2157aed18 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
2007-01-23 14:59:05 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
e916f08a85 Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-build
2007-01-23 14:53:59 +01:00
stewart@willster.(none)
a1a7816161 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
2007-01-24 00:44:11 +11:00
stewart@willster.(none)
6d267551a3 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
2007-01-24 00:37:11 +11:00
stewart@willster.(none)
dbaab7f474 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
2007-01-24 00:34:12 +11:00
stewart@willster.(none)
adf40be13b Bug#25567 records() call performs scan in NDB, performance bug 2007-01-24 00:27:19 +11:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
fddb97da98 Bug#25396
"Valgrind leak in closecon_handlerton"
  plugin_shutdown() calls plugin_deinitialize() which calls ha_finalize_handlerton().
  ndbcluster_end() fails to wait for the ndb utility thread to exit which results in
  the handlerton struct being freed before the ndb utility thread has destroyed it's THD
  but before the plugin has been marked as UNINITIALIZED

Bug is caused by misuse of abort_loops variable and not locking mutex during calls to
pthread condition variable functions causing a race in valgrind's pthread_cond_wait
implementation.
2007-01-23 05:09:14 -08:00
dlenev@mockturtle.local
6562df201a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491
2007-01-23 15:57:46 +03:00
svoj@june.mysql.com
0b0dfe6f64 Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
2007-01-23 16:36:29 +04:00
svoj@mysql.com/june.mysql.com
fb2172d20b Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
2007-01-23 16:35:17 +04:00
pekka@clam.(none)
0bdb9dc809 Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
2007-01-23 13:22:48 +01:00
dlenev@mockturtle.local
2b63f10601 Proposed fix for bug#24491 "using alias from source table in insert ...
on duplicate key".

INSERT ... SELECT ... ON DUPLICATE KEY UPDATE which was used in
stored routine or as prepared statement and which in its ON DUPLICATE
KEY clause erroneously tried to assign value to a column mentioned only
in its SELECT part was properly emitting error on the first execution
but succeeded on the second and following executions.

Code which is responsible for name resolution of fields mentioned in
UPDATE clause (e.g. see select_insert::prepare()) modifies table list
and Name_resolution_context used in this process. It uses
Name_resolution_context_state::save_state/restore_state() to revert
these modifications. Unfortunately those two methods failed to revert
properly modifications to TABLE_LIST::next_name_resolution_table
and this broke name resolution process for successive executions.

This patch fixes Name_resolution_context_state::save_state/restore_state()
in such way that it properly handles TABLE_LIST::next_name_resolution_table.
2007-01-23 15:03:48 +03:00
pekka@clam.ndb.mysql.com/clam.(none)
56e2d4ffcb ndb - bug#25562 use byte-size max_data_length() when setting blob part size 2007-01-23 12:58:10 +01:00
acurtis/antony@ltamd64.xiphis.org
a9183720c2 Merge xiphis.org:/home/antony/work2/p2-bug24270.2
into  xiphis.org:/home/antony/work2/p2-bug24270.3
2007-01-23 03:34:09 -08:00
istruewing@chilla.local
786063e30c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-23 11:09:58 +01:00
joerg@trift2.
e40ce2e081 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-01-23 11:05:44 +01:00
stewart@willster.(none)
5b886fa358 round up Transporter connect timeout 2007-01-23 17:19:27 +11:00
stewart@willster.(none)
4984af30ec Bug #25487 deleting ndb_cluster_connection object takes long time
aim is to:
  a) if set_connect_timeout called, timeout connect attempt (for retry on
  next call) after timeout period
  b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
  
  Related to customer issue with long time deleting ndb_cluster_connection
  object. believe we're hanging on the connect(2) call until timeout (when
  we then realise we should exit the thread).
2007-01-23 17:07:09 +11:00
tomas@poseidon.mysql.com
9a85d74e2a Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-23 11:46:13 +07:00
tomas@poseidon.mysql.com
6825593df8 ndb - bug#22013
Fix bug in event handling wrt early node shutdown
2007-01-23 11:44:42 +07:00
tomas@poseidon.mysql.com
a9193743a2 correct manual merge 2007-01-23 09:52:13 +07:00
tomas@poseidon.mysql.com
cd5f9b2f3e Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-23 07:25:24 +07:00
tomas@poseidon.mysql.com
12911bb5c0 bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
- post review changes
2007-01-23 07:12:03 +07:00
monty@hasky.mysql.fi
d1a1bf0a32 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
2007-01-23 02:01:13 +02:00
monty@hasky.mysql.fi
46afbe1d8b Merge monty@192.168.0.9:/home/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2007-01-23 02:00:27 +02:00
monty@mysql.com/narttu.mysql.fi
243a3a06e9 Change to new (after merge) error numbers 2007-01-23 01:58:07 +02:00
jonas@perch.ndb.mysql.com
6fae8d4133 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-22 22:25:56 +01:00
monty@hasky.mysql.fi
409b4d1263 Merge monty@192.168.0.9:/home/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2007-01-22 21:24:51 +02:00
monty@mysql.com/narttu.mysql.fi
33f8a2c5d7 Change to new (after merge) error numbers 2007-01-22 21:19:56 +02:00
df@kahlann.erinye.com
a5273edd2c 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
2007-01-22 18:48:47 +01:00
tomas@poseidon.mysql.com
9605aee4fe bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
- make sure keys are copied correctly when varchar has 2 length bytes
- test case
2007-01-23 00:34:00 +07:00
monty@narttu.mysql.fi
7df1dbcd74 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2007-01-22 19:18:22 +02:00
anozdrin/alik@alik.
ddffdd1c74 Enabling im_daemon_life_cycle.imtest in team tree.
Do not propagate this change into main trees.
2007-01-22 20:00:27 +03:00
jonas@perch.ndb.mysql.com
2e9fc22732 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-22 17:57:13 +01:00
monty@hasky.mysql.fi
c684d6c5e2 Merge monty@192.168.0.9:/home/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2007-01-22 18:52:27 +02:00
anozdrin/alik@alik.
4c4b58a17b Enabling im_daemon_life_cycle.imtest in team tree in order to debug IM.
Do not propagate this change into main trees!
2007-01-22 19:50:34 +03:00
monty@mysql.com/narttu.mysql.fi
2dcc7110c9 Give warnings for unused objects
Changed error message to be compatible with old error file
Added new error message for new DUP_ENTRY syntax
2007-01-22 18:42:52 +02:00
jonas@eel.(none)
220eb32a3b ndb - bug#25755
remove accidently left debug prinouts
2007-01-22 17:29:11 +01:00
jonas@eel.(none)
e7e4dde51e ndb - bug#25755
Make sure subscriber is removed from list when n_subscribers is decreased
2007-01-22 17:25:49 +01:00
jonas@perch.ndb.mysql.com
bae96d8ddb 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-22 17:16:36 +01:00
jonas@eel.(none)
f7c6b13375 ndb - fix bug is NODE_VERSION_REP
Fix assertion in corner-case where signal isnt sent to any node
2007-01-22 17:06:27 +01:00
df@kahlann.erinye.com
224ce90806 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-22 16:41:11 +01:00
df@kahlann.erinye.com
c5de0332e1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:39:40 +01:00
df@kahlann.erinye.com
96e9eee142 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-22 16:38:54 +01:00
df@kahlann.erinye.com
064b77a890 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work1-testcases-20061
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-22 16:37:27 +01:00
df@kahlann.erinye.com
9ed4299e22 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work1-testcases-20061
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:35:36 +01:00
df@kahlann.erinye.com
1b8b33bf83 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:34:22 +01:00