msvensson@pilot.mysql.com
36207f8088
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:27:43 +01:00
msvensson@pilot.mysql.com
3f06339d7c
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:27:00 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
878759b218
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b23782/b23782.5.0
2007-02-06 17:18:43 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
8222657a1c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b23782/b23782.5.1
2007-02-06 17:16:39 +04:00
msvensson@neptunus.(none)
8c37b28c0b
Bug#8983 one place that isn't strict-aliasing-safe
...
- Backport fix from 5.0
2007-02-06 14:07:40 +01:00
ramil/ram@myoffice.izhnet.ru
d5b11a5e7a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
2007-02-06 17:06:19 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
61ec25116e
Merge mysql.com:/home/ram/work/b23782/b23782.5.0
...
into mysql.com:/home/ram/work/b23782/b23782.5.1
2007-02-06 15:59:37 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
85f2f924fd
Fix for bug #23782 : Stored procedures: crash if variable in procedure
...
analyse
We have to call fix_fields() for procedure analyse' arguments as they may
not be
fixed in some circumstances.
(as the crash appears when mysqld starts skipping binlog, a test case
will be added when we can --skip-bin-log in -master.opt)
2007-02-06 15:58:40 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d69e5063b2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
2007-02-06 14:58:07 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a4bbd5bf76
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
2007-02-06 14:28:46 +04:00
ramil/ram@myoffice.izhnet.ru
6fea92a146
Merge mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
...
into mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
2007-02-06 14:20:46 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f103fde258
Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
...
into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
2007-02-06 13:57:20 +04:00
gkodinov/kgeorge@macbook.gmz
5092f7ab26
Bug #22344 : InnoDB keys act strange on datetime vs timestamp comparison
...
Ignoring error codes from type conversion allows default (wrong) values to
go unnoticed in the formation of index search conditions.
Fixed by correctly checking for conversion errors.
2007-02-06 11:08:57 +02:00
tomas@poseidon.mysql.com
3fc4f75ec7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-06 15:00:19 +07:00
tomas@poseidon.mysql.com
54bd795f12
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-06 12:45:42 +07:00
tomas@poseidon.mysql.com
bbe3008a49
Bug #26021 - ndb: valgrind warning handle_trailing_share/ndbcluster_free_share invalid read
2007-02-06 12:40:26 +07:00
tomas@poseidon.mysql.com
77ee8eab9c
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-06 00:10:56 +07:00
tomas@poseidon.mysql.com
addb495339
Bug #26021 valgrind warning handle_trailing_share/ndbcluster_free_share invalid read
...
- revert bugfix, needs more work
2007-02-06 00:09:45 +07:00
kroki/tomash@moonlight.home
5dc4f103ae
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug25897
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
2007-02-05 18:29:36 +03:00
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
rafal@quant.(none)
b50f3c3149
BUG#25306 (Race conditions during replication slave shutdown (valgrind stacks)):
...
The possibility of the race is removed by changing sequence of calls
pthread_mutex_unlock(&mi->run_lock);
pthread_cond_broadcast(&mi->stop_cond);
into
pthread_cond_broadcast(&mi->stop_cond);
pthread_mutex_unlock(&mi->run_lock);
at the end of I/O thread (similar change at the end of SQL thread). This ensures
that no thread waiting on the condition executes between the broadcast and the
unlock and thus can't delete the mi structure which caused the bug.
2007-02-03 20:14:16 +01: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