svoj@mysql.com/june.mysql.com
122167bb4b
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-05-23 12:39:33 +05:00
svoj@mysql.com/june.mysql.com
a4ddc22621
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2007-05-23 12:38:34 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
240a927c54
Bug#28558 UpdateXML called with garbage crashes server
...
Problem: Memory overrun happened in attempts to generate
error messages (e.g. in case of incorrect XPath syntax).
Reason: set_if_bigger() was used instead of set_if_smaller().
Change: replacing wrong set_if_bigger() to set_if_smaller(),
and making minor additional code clean-ups.
2007-05-23 12:34:47 +05:00
df@pippilotta.erinye.com
f8433465a2
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-05-23 08:40:39 +02:00
tomas@whalegate.ndb.mysql.com
2ff938d21c
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 23:28:19 +02:00
tomas@whalegate.ndb.mysql.com
b789452743
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-22 23:21:55 +02:00
tomas@whalegate.ndb.mysql.com
a4934466c0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 23:21:32 +02:00
tomas@whalegate.ndb.mysql.com
481b314e9a
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-22 23:20:40 +02:00
tomas@whalegate.ndb.mysql.com
7b2c430f58
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-22 23:19:45 +02:00
joerg@trift2.
b8e3fb1333
Merge trift2.:/MySQL/M50/bug26609-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-05-22 20:02:23 +02:00
tomas@whalegate.ndb.mysql.com
2c715f1ad4
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 17:57:48 +02:00
tomas@whalegate.ndb.mysql.com
b46c826aee
Bug #28593 cluster backup scans in acc index order, bad for disk data
...
- change to scan in tup and disk order (if applicable)
2007-05-22 17:53:07 +02:00
joerg@trift2.
49dc9c5971
Merge trift2.:/MySQL/M50/bug26609-5.0
...
into trift2.:/MySQL/M51/bug26609-5.1
2007-05-22 17:51:51 +02:00
joerg@trift2.
1185004419
Add the "row_lock" test suite to the (to be) release build test run.
2007-05-22 17:21:22 +02:00
joerg@trift2.
b0677f1ddc
scripts/make_binary_distribution.sh :
...
Include all the additional test suites in the binary packages ("tar.gz").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
2007-05-22 17:06:47 +02:00
cbell/Chuck@mysql_cab.
0ce86cdc51
BUG#17654 : --read-from-remote-server causes core
...
This patch corrects a problem encountered when reading the binlog from a remote
host. The application was crashing because the buffer variable (temp_buf) in
log_event was not pointing to the incoming data. For a normal file read, this
buffer is allocated by a previous call of read_log_event. However, when reading
from a remote host, the first call to read_log_event is not executed therefore
no buffer is allocated. Furthermore, there is no need to allocate a new buffer
because the incoming stream is what needs to be read.
This patch adds the call to initialize the temp_buf variable if reading from a
remote host. It also adds a check at destroy time to ensure the temp_buf is not
freed if reading from a remote host.
2007-05-22 10:50:32 -04:00
tsmith@quadxeon.mysql.com
6ddf4785bb
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 21:03:03 +02:00
tsmith@quadxeon.mysql.com
b3a84ddd89
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-21 20:55:10 +02:00
tsmith@quadxeon.mysql.com
f8ac268e58
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 20:53:15 +02:00
tsmith@quadxeon.mysql.com
672237f5b5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 20:51:31 +02:00
tsmith@quadxeon.mysql.com
99488b31b9
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-21 20:50:08 +02:00
tsmith@quadxeon.mysql.com
2c3bebc570
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-05-21 20:49:24 +02:00
joerg@trift2.
8a0f37d559
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-05-21 20:34:42 +02:00
joerg@trift2.
bbae855c72
Prevent the failing "jp" suite from causing havoc in release builds (28563).
2007-05-21 20:24:34 +02:00
svoj@mysql.com/june.mysql.com
fbb5c31aa9
BUG#25659 - memory leak via "plugins" test
...
- Added suppressions for dlopen to make plugin test pass.
- Do not pass empty string to mysqld, since my_getopt is
not capable to handle it.
- Re-enabled trailing UNINSTALL PLUGIN statement of plugin.test.
The memory leak described in the bug report happens in libdl, not
in mysqld. On some valgrind installations this error is suppressed
by default, no idea why it isn't suppressed on pb-valgrind.
<observation>
If library remains open after thread has finished, and is closed by
another thread, we get memory leak. But in case library is opened and
closed by the same thread no leak occurs.
</observation>
2007-05-21 17:48:29 +05:00
svoj@june.mysql.com
404ee9d579
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG28341/mysql-5.1-engines
2007-05-21 14:33:54 +05:00
tomas@whalegate.ndb.mysql.com
ffe2982b99
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-21 09:01:06 +02:00
tomas@whalegate.ndb.mysql.com
709cfbc1f8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-21 08:50:21 +02:00
tomas@whalegate.ndb.mysql.com
11feedf073
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-21 08:49:49 +02:00
tomas@whalegate.ndb.mysql.com
9f1cba8ec0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-21 08:49:15 +02:00
tomas@whalegate.ndb.mysql.com
a2b2bbd925
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-21 08:48:33 +02:00
svoj@mysql.com/june.mysql.com
fbf65c86ea
BUG#25659 - memory leak via "plugins" test
...
Re-enabled plugin test to check if it still leaks memory.
2007-05-21 11:48:05 +05:00
svoj@mysql.com/june.mysql.com
725d728f0e
Addition to fix for
...
BUG#28341 - Security issue still in library loading
Added required option files to rpl_udf test.
2007-05-21 11:34:39 +05:00
svoj@june.mysql.com
80c571b49d
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG28341/mysql-5.1-engines
2007-05-21 10:08:28 +05:00
holyfoot/hf@hfmain.(none)
a61c5f7722
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-20 21:10:44 +05:00
msvensson@pilot.blaudden
55cdaa7ef7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-19 18:25:33 +02:00
msvensson@pilot.blaudden
a518646603
Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
...
- Upgrade result file for 5.1
2007-05-19 18:22:55 +02:00
msvensson@pilot.blaudden
a3bd588435
Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-19 18:22:08 +02:00
msvensson@pilot.blaudden
45c202a3a3
Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401
...
into pilot.blaudden:/home/msvensson/mysql/bug28401/my51-bug28401
2007-05-19 18:15:40 +02:00
msvensson@pilot.blaudden
bc69d072f3
Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
...
- The SQL commands used by mysql_upgrade are written to be run
with sql_mode set to '' - thus the scripts should change sql_mode
for the session to make sure the SQL is legal.
2007-05-19 18:15:08 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
e04000ec21
merging
2007-05-18 23:21:34 +05:00
holyfoot/hf@hfmain.(none)
44331376e7
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-18 22:12:06 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d5685d4cc4
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 22:09:15 +05:00
serg@sergbook.mysql.com
c7a4547361
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2007-05-18 18:22:38 +02:00
serg@sergbook.mysql.com
11e5fa8f71
added cleanup to some tests
2007-05-18 17:48:44 +02:00
holyfoot/hf@hfmain.(none)
e2abd12b79
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-18 20:04:39 +05:00
holyfoot/hf@hfmain.(none)
783c7071bf
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-18 20:04:01 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
093b0deb06
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 20:02:55 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b21517de4
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 20:02:27 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
38c8951d11
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-05-18 20:01:49 +05:00