svoj@june.mysql.com
33ad5a480f
Merge mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.1-engines
2008-02-20 21:22:21 +04:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d2ad8286a0
backport valgrind cleanups from 6.0-engines
2008-02-19 13:46:54 -08:00
acurtis/antony@ltamd64.xiphis.org
f6c3587eab
Merge xiphis.org:/anubis/antony/work/p1-bug34598.2
...
into xiphis.org:/anubis/antony/work/p1-bug34598.2.merge.1
2008-02-19 13:36:49 -08:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
118ebdf720
Bug#34598
...
"crash on hpita: Invalid address alignment"
Replace dangerous pointer arithmetic - it may occurr where sizeof(int) is
less than size of machine alignment requirement.
2008-02-19 12:55:13 -08:00
svoj@mysql.com/june.mysql.com
921e1cc4bb
BUG#34289 - Incorrect NAME_CONST substitution in stored procedures
...
breaks replication
NAME_CONST() didn't replicate constant character set and collation
correctly.
With this fix NAME_CONST() inherits collation from the value argument.
2008-02-19 18:16:17 +04:00
istruewing@stella.local
364a70ef09
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-15 20:45:29 +01:00
istruewing@stella.local
4bbbd57c81
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-15 20:44:33 +01:00
istruewing@stella.local
b620694ba3
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-15 20:06:15 +01:00
mkindahl@dl145h.mysql.com
a1a94e238f
Adding waits to events_scheduling to prevent the test from
...
failing on heavily loaded systems.
2008-02-15 10:24:13 +01:00
istruewing@stella.local
302beb1def
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 21:00:50 +01:00
istruewing@stella.local
108013f6a7
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 21:00:10 +01:00
istruewing@stella.local
6c977025df
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-14 20:24:01 +01:00
istruewing@stella.local
e053763bef
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:53:51 +01:00
istruewing@stella.local
9a4d57e319
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:53:03 +01:00
istruewing@stella.local
fb20c9dd5e
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:51:41 +01:00
istruewing@stella.local
b6c8f8a58b
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-14 16:14:30 +01:00
istruewing@stella.local
d00dbff4ce
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-14 16:13:51 +01:00
svoj@mysql.com/april.(none)
75495093b0
After merge fix.
2008-02-14 18:23:58 +04:00
svoj@april.(none)
2ab1b8406e
Merge mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.1-engines
2008-02-14 16:47:46 +04:00
svoj@mysql.com/april.(none)
7fa875e42b
BUG#33946 - Join on Federated tables with Unique index gives error 1430
...
from storage engine
Federated may crash a server, return wrong result set, return
"ERROR 1030 (HY000): Got error 1430 from storage engine" message
when local (engine=federated) table has a key against nullable
column.
The problem was wrong implementation of function that creates
WHERE clause for remote query from key.
2008-02-14 16:27:01 +04:00
mkindahl@dl145h.mysql.com
fd5d7fa761
Fixing test rpl_events to not give false failures.
2008-02-14 10:53:12 +01:00
mkindahl@dl145h.mysql.com
8906700e13
Fixes to try to handle valgrind warnings identical to those in
...
BUG#24387, which is closed since long.
2008-02-14 09:53:01 +01:00
mkindahl@dl145h.mysql.com
32853b9fa5
Removing non-deterministic tests from events_scheduling test.
2008-02-13 12:41:54 +01:00
mkindahl@dl145h.mysql.com
b1fadc4cf9
The test rpl_row_charset and it dependent rpl_ndb_charset is
...
irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.
This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.
2008-02-13 11:37:06 +01:00
mikael@dator6.(none)
2505979575
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-13 11:30:38 +01:00
mikael@dator6.(none)
e1820b2e77
Merge dator6.(none):/home/mikael/mysql_clones/bug32943
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-13 11:29:50 +01:00
mikael@dator6.(none)
2bff6fd22a
Added comments on why we do reopen
...
Handle error case of not being able to reopen which
requires us to remove table from thread's open list
and table_cache.
2008-02-13 11:26:24 +01:00
mkindahl@dl145h.mysql.com
a3fe485dfe
Various fixes to fix memory leaks after merging replication
...
tree with main.
2008-02-12 18:21:17 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
1ba6f57efc
Merge mysql.com:/home/ram/work/mysql-5.1-engines
...
into mysql.com:/home/ram/work/b33758/b33758.5.1
2008-02-12 15:48:10 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
6b3ea484e2
Merge mysql.com:/home/ram/work/b33758/b33758.5.0
...
into mysql.com:/home/ram/work/b33758/b33758.5.1
2008-02-12 15:14:56 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a64d12ce3a
Fix for bug #33758 : Got query result when using ORDER BY ASC, but
...
empty result when using DESC
Problem: fetching MyISAM keys we copy a key block pointer to the end of the key buffer.
However, we don't take into account the pointer length calculatig the buffer size,
that may leads to memory overwriting and in turn to unpredictable results.
Fix: increase key buffer size by length of the key block pointer.
Note: no simple test case.
2008-02-12 15:12:45 +04:00
mkindahl@dl145h.mysql.com
e91c287ead
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-11 18:16:56 +01:00
mkindahl@dl145h.mysql.com
83dac31180
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-11 18:10:56 +01:00
mkindahl@dl145h.mysql.com
23d670c33e
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-02-11 18:09:17 +01:00
mkindahl@dl145h.mysql.com
3afb341aaf
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-02-11 17:57:02 +01:00
anozdrin/alik@quad.
301ab0d8b7
Disable sporadically failing test cases (Bug#34454).
2008-02-11 14:34:53 +03:00
istruewing@stella.local
ef6f3e5ceb
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:11:53 +01:00
istruewing@stella.local
d1bd8d88da
Merge stella.local:/home2/mydev/mysql-5.1-bug31331
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:08:12 +01:00
istruewing@stella.local
16be963007
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:07:19 +01:00
anozdrin/alik@quad.
524cbe2e4c
Disabling declaration of debug variable for non-debug builds.
...
(originally from Mats)
2008-02-11 14:05:27 +03:00
anozdrin/alik@quad.
a52a30e3e6
Patch to eliminate some valgrind warnings in debug printout code.
...
(originally from Mats)
2008-02-11 14:04:30 +03:00
istruewing@stella.local
d59ee3db2d
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 11:58:23 +01:00
istruewing@stella.local
21534505d0
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-11 11:19:06 +01:00
mkindahl@dl145h.mysql.com
ccd09676db
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-11 10:06:21 +01:00
mkindahl@dl145h.mysql.com
525a324a77
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-02-11 09:42:28 +01:00
sven@riska.(none)
41bb462652
Problem: pushbuild fails in embedded mode on test binlog_base64_flag
...
because it uses BINLOG statement, which is not supported in embedded mode.
Fix: disable the test in embedded mode.
2008-02-09 19:43:32 +01:00
kostja@dipika.(none)
b09af4bef4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-09 14:42:26 +03:00
kostja@dipika.(none)
84713274ba
Fix a buffer overflow with strmake().
2008-02-09 10:31:22 +03:00
malff@lambda.hsd1.co.comcast.net.
20e33c30a0
Fixed buffer overflow
2008-02-08 19:37:57 -07:00
sven@riska.(none)
d1963d066b
BUG#33247: mysqlbinlog does not clean up after itself on abnormal termination
...
Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.
2008-02-08 18:17:00 +01:00