Commit graph

19365 commits

Author SHA1 Message Date
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
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
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
dlenev@mockturtle.local
282501df21 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg24491
2007-01-24 10:42:57 +03:00
mjorgensen@production.mysql.com
2e174533f0 Merge bk-internal:/home/bk/mysql-5.1
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
2007-01-23 20:38:00 +01:00
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
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)
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
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
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
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
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
joerg@trift2.
9e46e0aa74 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-01-22 10:32:22 +01:00
dlenev@mockturtle.local
92704745f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg25044
2007-01-20 14:10:20 +03:00
dlenev@mockturtle.local
83bcfa2541 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25044
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25044
2007-01-19 23:23:45 +03:00
dlenev@mockturtle.local
7b1a94ef78 Fix for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires global 'opening
tables' lock."

Execution of ALTER TABLE ... ENABLE KEYS on a table (which can take rather
long time) prevented concurrent execution of all statements using tables.

The problem was caused by the fact that we were holding LOCK_open mutex
during whole duration of this statement and particularly during call
to handler::enable_indexes(). This behavior was introduced as part of the
fix for bug 14262 "SP: DROP PROCEDURE|VIEW (maybe more) write to binlog
too late (race cond)"

The patch simply restores old behavior. Note that we can safely do this as
this operation takes exclusive lock (similar to name-lock) which blocks both
DML and DDL on the table being altered.

It also introduces mysql-test/include/wait_show_pattern.inc helper script
which is used to make test-case for this bug robust enough.
2007-01-19 23:15:59 +03:00
ramil/ram@mysql.com/myoffice.izhnet.ru
86322e269f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-19 08:56:03 +04:00
ramil/ram@myoffice.izhnet.ru
1b488c7fbe Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-19 08:54:10 +04:00
malff/marcsql@weblab.(none)
a0c1c61b1f Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-24562-merge
2007-01-18 18:43:11 -07:00
malff/marcsql@weblab.(none)
4064c89d24 Manual merge 2007-01-18 18:37:52 -07:00
cmiller@zippy.cornsilk.net
d0a2f4d9b8 Fix merge problem. 2007-01-18 18:02:58 -05:00
tsmith@siva.hindu.god
1d72994246 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:38:49 -07:00
tsmith@siva.hindu.god
6b729ff2cd Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
cc7afe2494 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6eba677517 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-18 17:10:00 +04:00
ramil/ram@myoffice.izhnet.ru
3760672ead Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-18 16:40:49 +04:00
joerg@trift2.
f5e2857b0b Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-01-18 13:33:23 +01:00
mskold/marty@mysql.com/linux.site
c72cae75d4 Crash in rpl_ndb_dd_advance: check for null transaction pointer 2007-01-18 13:21:20 +01:00
ramil/ram@myoffice.izhnet.ru
9d86d7e97b Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-18 15:59:40 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c57442d6d8 after merge fix. 2007-01-18 15:28:45 +04:00
kroki/tomash@moonlight.home
ec21b828f0 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug24404
2007-01-18 13:06:10 +03:00
kroki/tomash@moonlight.home
fbeadd43a5 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug24404
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug24404
2007-01-18 12:57:34 +03:00
kroki/tomash@moonlight.home
6e771358ce Bug#24404: strange bug with view+permission+prepared statement.
The problem was that if a prepared statement accessed a view, the
access to the tables listed in the query after that view was done in
the security context of the view.

The bug was in the assigning of the security context to the tables
belonging to a view: we traversed the list of all query tables
instead.  It didn't show up in the normal (non-prepared) statements
because of the different order of the steps of checking privileges
and descending into a view for normal and prepared statements.

The solution is to traverse the list and stop once the last table
belonging to the view was processed.
2007-01-18 12:48:17 +03:00
ramil/ram@myoffice.izhnet.ru
a2303ea3fe Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-18 11:13:13 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5c42e68388 after merge fix. 2007-01-18 10:51:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
e8968822dc Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-18 09:39:47 +04:00
cmiller@zippy.cornsilk.net
abd057be56 errmsg update from Stefan. 2007-01-17 15:01:28 -05:00
joerg@trift2.
4da7643924 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-01-17 20:56:01 +01:00
lars/lthalmann@dl145k.mysql.com
74f748999b Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-17 19:48:35 +01:00
lars/lthalmann@dl145j.mysql.com
5810ca92c9 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-17 19:32:14 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b25079d61a Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-01-17 19:30:05 +01:00
kostja@bodhi.local
1480f9f48c Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-01-17 20:47:50 +03:00
kostja@bodhi.local
15c9d8a6c9 Disable symlinks under valgrind builds (again), with a comment. 2007-01-17 20:46:09 +03:00