jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08
Test and bug fixes and removed unneccessary files.
2007-02-05 17:09:44 +02:00
svoj@june.mysql.com
4a6770e06e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-02-05 15:31:20 +04:00
knielsen@ymer.(none)
cb9e8bcad8
Fix false Valgrind warning.
...
On some compiler/platform combination, an assignment of form *p= *p
would map to a memcpy() call, and Valgrind flags this as an overlapped
memcpy() error.
Fix by prefixing *p= *q with if(p!=q) when building for Valgrind
(HAVE_purify).
2007-02-05 10:50:08 +01:00
tomas@poseidon.mysql.com
771c979514
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-05 13:22:33 +07:00
tomas@poseidon.mysql.com
475da34697
Bug #26021 - valgrind reports error regarding handle_trailing_share and client thread share usage
...
- add ndb_share connect_count to decide if share can be reused to setup replication
2007-02-05 13:21:18 +07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
64a728ce0c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
2007-02-05 10:20:47 +04:00
ramil/ram@myoffice.izhnet.ru
9e36baa952
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
2007-02-05 10:17:51 +04:00
tomas@poseidon.mysql.com
68e0fd6735
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-05 13:10:24 +07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
47ae650a57
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
2007-02-05 10:09:31 +04:00
ramil/ram@myoffice.izhnet.ru
0974b9fa11
Merge mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
...
into mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
2007-02-05 09:56:30 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b0977714a8
Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
...
into mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
2007-02-05 09:54:23 +04:00
tomas@poseidon.mysql.com
3c265e5944
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-05 12:19:24 +07:00
tomas@poseidon.mysql.com
b3fa3c8d62
Bug #26019 - valgrind warning ndbcluster_log_schema_op/safe_mutex_lock invalid read
...
protect the setting of ndb_schema_share = NULL with a mutex
2007-02-05 12:04:36 +07:00
kroki/tomash@moonlight.home
664cd8b6a9
BUG#25897: Some queries are no longer possible after a CREATE VIEW
...
fails
The bug was introduced with the push of the fix for bug#20953: after
the error on view creation we never reset the error state, so some
valid statements would give the same error after that.
The solution is to properly reset the error state.
2007-02-04 16:49:24 +03:00
igor@olga.mysql.com
5313db2d82
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24035
2007-02-03 10:37:45 -08:00
kroki/tomash@moonlight.home
d163a5f9fc
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug23225
2007-02-03 14:43:41 +03:00
istruewing@chilla.local
dde4f421f1
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:44:40 +01:00
istruewing@chilla.local
bdf18a85f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:43:38 +01:00
istruewing@chilla.local
b444566412
After merge fix
2007-02-03 09:26:11 +01:00
igor@olga.mysql.com
215b0a95e1
Fix bug #24035 .
...
This performance degradation for UPDATEs could be observed in the update
statements for which the search key cannot be converted to any valid
value of the type of the search column, like for a the condition
int_fld=99999999999999999999999999, though it can be guaranteed here
that there is no row with such a key value.
2007-02-02 15:22:10 -08:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
istruewing@chilla.local
77e99fe2ce
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 23:05:46 +01:00
istruewing@chilla.local
41b6b32ef7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 21:32:58 +01:00
istruewing@chilla.local
972df14cc6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-02 20:23:03 +01:00
istruewing@chilla.local
177a366e53
After merge fix
2007-02-02 20:19:13 +01:00
cmiller@zippy.cornsilk.net
06916f5077
Reverting previous change from 1L -> 1ULL and LL(1) -> 1ULL and
...
making all to be uniform ULL(1), which is a local definition.
2007-02-02 13:11:44 -05:00
kroki/tomash@moonlight.home
a4017eceb1
BUG#16425: Events: no DEFINER clause
...
There was already support for CREATE DEFINER=... EVENT syntax in the
parser, but DEFINER information was ignored.
This patch adds processing of DEFINER, and a new ALTER DEFINER=...
EVENT syntax.
2007-02-02 20:43:33 +03:00
tomas@poseidon.mysql.com
36a674b2eb
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-02-02 21:04:02 +07:00
tomas@poseidon.mysql.com
d45e1e4e67
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-02 21:01:34 +07:00
gluh@mysql.com/eagle.(none)
938de5eee4
another valgrind error fix for 4.1(backport from 5.0)
2007-02-02 17:18:42 +04:00
joerg@trift2.
ad7b10ca19
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into trift2.:/MySQL/M51/push-5.1
2007-02-02 13:57:19 +01:00
gluh@mysql.com/eagle.(none)
9663691aca
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-02 15:21:14 +04:00
kroki/tomash@moonlight.home
c9038f9292
BUG#23225: Slow query log: setting slow_query_log_file writes to
...
wrong file
After execution of SET GLOBAL SLOW_QUERY_LOG_FILE=...; slow query log
data would go into the general log file.
The problem was in the bogus cut-n-paste in the code.
2007-02-02 14:21:04 +03:00
gluh@mysql.com/eagle.(none)
29e1d5f9ce
after merge fix
2007-02-02 14:26:53 +04:00
lzhou/zhl@dev3-63.(none)
8f9f666888
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb
2007-02-02 09:39:05 +00:00
gluh@eagle.(none)
7849d31923
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-02 10:25:45 +04:00
istruewing@chilla.local
ed09987083
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 19:41:04 +01:00
lzhou/zhl@dev3-63.(none)
224900565c
Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb
2007-02-01 17:34:20 +00:00
malff/marcsql@weblab.(none)
f0ebefbb8f
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-21904_b
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-21904_b-merge
2007-02-01 09:37:04 -07:00
malff/marcsql@weblab.(none)
093eba867d
Improved comments
2007-02-01 09:36:17 -07:00
istruewing@chilla.local
dae855c168
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 17:10:09 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2c45e72e04
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/home/ram/work/b26012/b26012.4.1
2007-02-01 19:56:14 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ac0cab1589
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26012/b26012.5.0
2007-02-01 19:55:11 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
6136556fba
Merge mysql.com:/home/ram/work/b26012/b26012.5.0
...
into mysql.com:/home/ram/work/b26012/b26012.5.1
2007-02-01 19:52:33 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7bcf2bf338
Merge mysql.com:/home/ram/work/b26012/b26012.4.1
...
into mysql.com:/home/ram/work/b26012/b26012.5.0
2007-02-01 19:51:45 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d710853fb8
Fix for bug #26012 : missed Field_double::size_of()
...
As we have Field_double::not_fixed we must have Field_double::size_of().
2007-02-01 19:51:02 +04:00
gluh@mysql.com/eagle.(none)
d1185aaeaf
Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
...
additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
2007-02-01 19:12:45 +04:00
joerg@trift2.
9af6d01e3c
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-02-01 15:57:01 +01:00
istruewing@chilla.local
33e1d1091a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 15:51:25 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c
Valgrind error fixes
...
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
2007-02-01 18:00:24 +04:00