tomas@poseidon.ndb.mysql.com
5971c0872b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-15 20:35:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1b524d6b5f
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-15 21:33:47 +03:00
tomas@poseidon.ndb.mysql.com
ca4b18fb15
correction of merge
2006-05-15 20:29:50 +02:00
msvensson@neptunus.(none)
95ebebbe15
Bug#19804 Tests run with valgrind shows uninitialised value in yaSSL
...
- memset Connection.sessionID_ in Connection contructor
- From upstream yaSSL
2006-05-15 20:24:51 +02:00
tomas@poseidon.ndb.mysql.com
4f04007ece
ndb: dict cache reference not released as it should
2006-05-15 20:24:50 +02:00
knielsen@mysql.com
b6ee2d2340
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:12 +02:00
aelkin@dl145j.mysql.com
6bdd2bbcc1
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/andrei/5.0
2006-05-15 19:57:11 +02:00
knielsen@mysql.com
5d1c68ed35
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:11 +02:00
knielsen@mysql.com
c8fd62f3b2
After-merge fixes; some function signatures changed from Item * to Item **.
2006-05-15 19:57:10 +02:00
knielsen@mysql.com
bec4d0a1fa
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:09 +02:00
aivanov@mysql.com
68cca4214d
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss547
2006-05-15 21:57:08 +04:00
pekka@mysql.com
da44e731cc
ndb - bug#19537: arithmetic conversion Uint64 reg to Uint32 attr
2006-05-15 19:53:29 +02:00
aivanov@mysql.com
9326f67dda
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1-ss29
2006-05-15 21:53:28 +04:00
tomas@poseidon.ndb.mysql.com
747dc71f9f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-15 18:44:17 +02:00
knielsen@mysql.com
5f637ef29c
After-merge fixes.
2006-05-15 18:41:05 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3846438a9c
Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table"
...
The problem is that in a MyISAM table the following column
after a varchar field gets corrupted, if varchar field is
extended.
This should be made to work without a copy in the future, but
I'm not sure if this code is ready yet. This fix will force copy
in this case. It will not do any harm to have it here, only makes
alter table a bit slower in this case. If this should work for
MyISAM, then the bug is somewhere else in that code.
Until it works, I propose this as a temporary fix or a workaround.
Test case for the bug has been added.
2006-05-15 19:41:04 +03:00
knielsen@mysql.com
1e8c6f16e5
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug19633
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-15 18:41:04 +02:00
aivanov@mysql.com
9c26c629a2
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work
...
into mysql.com:/home/alexi/innodb/mysql-5.1-ss547
Null merge
2006-05-15 20:41:03 +04:00
knielsen@mysql.com
fc16aff742
Fix two Valgrind memory leak warnings.
2006-05-15 18:07:18 +02:00
tomas@poseidon.ndb.mysql.com
271c72aa03
Bug #16875 , correction of previous patch
2006-05-15 17:16:21 +02:00
aivanov@mysql.com
332c690273
Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss29-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work
Null merge
2006-05-15 19:07:18 +04:00
aelkin@mysql.com
061ed857eb
BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
...
specific to 5.0 version of the patch is motivated by the fact that a wrapper over
MYSQLLOG::write can not help in 5.0 where query's charset is embedded into event instance in the constructor.
2006-05-15 18:05:23 +03:00
tomas@poseidon.ndb.mysql.com
fe9934c9fe
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
...
- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid
2006-05-15 16:23:59 +02:00
kroki@mysql.com
a6904ef018
Remove 'const' that prevents Microsoft VC realize that
...
Item_trigger_field::set_required_privilege(const bool rw) is an
overloading of Settable_routine_parameter::set_required_privilege(bool rw).
2006-05-15 18:18:37 +04:00
aivanov@mysql.com
f748232437
Applied innodb-5.0-ss547 snapshot.
...
Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter".
2006-05-15 18:02:21 +04:00
aivanov@mysql.com
9595317cfa
Applied innodb-4.1-ss29 snapshot.
...
Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter.
2006-05-15 17:25:37 +04:00
knielsen@mysql.com
c16b1f8676
Removed two duplicate/redundant suppressions.
...
Added some suppressions needed for Valgrind on RHAS3 64-bit.
2006-05-15 15:06:46 +02:00
kroki@mysql.com
491ba404fe
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug14635
2006-05-15 14:36:51 +04:00
sergefp@mysql.com
e5ae30fdef
BUG#19618: Crash for unsigned_col NOT IN (-1, ... )
...
- When manually constructing a SEL_TREE for "t.key NOT IN(...)", take into account that
get_mm_parts may return a tree with type SEL_TREE::IMPOSSIBLE
- Added missing OOM checks
- Added comments
2006-05-15 14:18:23 +04:00
knielsen@mysql.com
6703a50f7d
BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
...
Stored procedure execution sometimes placed the address of auto variables
in the list of Item changes to undo in THD::rollback_item_tree_changes().
This could cause stack corruption.
2006-05-15 12:01:55 +02:00
tomas@poseidon.ndb.mysql.com
2c0955bda0
Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug
2006-05-15 10:50:31 +02:00
kroki@mysql.com
ed6ad7d359
Fix possible race. Use LOCK_grant on access to grant_version.
2006-05-15 11:56:02 +04:00
konstantin@mysql.com
85c6883146
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-05-15 00:51:12 +04:00
aelkin@mysql.com
45d553a44c
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-05-14 20:50:15 +03:00
aelkin@mysql.com
c8a6d6c473
BUG#19188: incorrect temporary table name of DROP query in replication
...
manual merge to account 5.0 specific names of TABLE class
2006-05-14 20:31:42 +03:00
aelkin@mysql.com
ab440799e1
BUG#14157: utf8 encoding in binlog without set character_set_client
...
fixing names length. Got an issue when merged to 5.0, decided to fix starting from 4.1
2006-05-14 20:09:09 +03:00
holyfoot@deer.(none)
b457eaba71
bug 15430 (init_connect test fails with the embedded server)
...
mysqltest program should be really multithreaded to perform this
test with the embedded server. So this test disabled until we
redo mysqltest this way
2006-05-14 21:49:33 +05:00
holyfoot@deer.(none)
447e9f019f
bug #15435 (wait_timeout.test fails with the embedded server)
...
this test just can't work in the embedded server
2006-05-14 21:43:22 +05:00
aelkin@mysql.com
c90ae2d2e5
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-05-14 11:35:33 +03:00
kent@mysql.com
72a47d06f4
valgrind.supp:
...
Added suppressions for Red Hat AS 4
2006-05-14 01:14:47 +02:00
igor@rurik.mysql.com
a0df09eee2
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2006-05-13 12:02:47 -07:00
igor@rurik.mysql.com
058cba6b11
Fixed bug #19396 : a crash for a an outer join operation
...
over two views when using syntax with curly braces.
Each outer join operation must be placed in a separate
nest. This was not done when the syntax with curly braces
was used. In some cases, in particular, for queries with outer
join operation over views it could cause a crash.
2006-05-13 11:56:05 -07:00
sergefp@mysql.com
a70bfd6c69
Merge mysql.com:/home/psergey/tmp_merge3
...
into mysql.com:/home/psergey/mysql-5.1-merge2
2006-05-13 22:40:26 +04:00
aelkin@mysql.com
27696712ef
BUG#14157: utf8 encoding in binlog without set character_set_client
...
fixing a path to find charset by $MYSQL client. I believe the fix is done what should be
by default.
2006-05-13 12:14:20 +03:00
gluh@eagle.intranet.mysql.r18.ru
98b81c4f25
Bug#17048 CREATE TABLE ... SELECT truncate values
...
remove initialization of unsigned_flag for Item_decimal
2006-05-13 13:13:05 +05:00
acurtis@xiphis.org
ff71980af7
fix binlog results
2006-05-13 01:09:00 -07:00
acurtis@xiphis.org
a84822afde
fix partition test
2006-05-12 22:30:13 -07:00
igor@rurik.mysql.com
1f5b00e0bc
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2006-05-12 18:29:49 -07:00
igor@rurik.mysql.com
90f227043b
Fixed bug #19490 . The bug that caused server crash manifested
...
itself when executing queries referring to a view with GROUP BY
an expression containing non-constant interval.
It happened because Item_date_add_interval::eq neglected the
fact that the method can be applied to an expression of the form
date(col) + interval time_to_sec(col) second
at the time when col could not be evaluated yet.
An attempt to evaluate time_to_sec(col) in this method resulted
in a crash.
2006-05-12 18:24:38 -07:00
acurtis@xiphis.org
4e2c63a7ba
Merge bk-internal:/home/bk/mysql-5.1-new
...
into xiphis.org:/home/acurtis/mysql-5.1-merge
2006-05-12 17:40:58 -07:00