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
holyfoot/hf@hfmain.(none)
85d5dfedf6
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-18 20:00:49 +05:00
svoj@mysql.com/june.mysql.com
e3f7947da0
BUG#28341 - Security issue still in library loading
...
UDF can be created from any library in any part of the server
LD_LIBRARY_PATH.
Allow to load udfs only from plugin_dir.
On windows, refuse to open udf in case it's path contains a slash.
No good test case for this bug because of imperfect error message
that includes error code and error string when it fails to dlopen a
library.
2007-05-18 16:23:46 +05:00
msvensson@pilot.blaudden
cdef920866
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-18 13:01:05 +02:00
msvensson@pilot.blaudden
01ae08078e
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-18 12:58:28 +02:00
msvensson@pilot.blaudden
7bc79da2c8
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-05-18 12:58:11 +02:00
msvensson@pilot.blaudden
cea8860583
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-18 12:58:05 +02:00
msvensson@pilot.blaudden
c3f407a07a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-18 12:56:52 +02:00
msvensson@pilot.blaudden
e05aa94353
WL#2247 mysqltest: add option for sorting results
...
- Final touchups
2007-05-18 12:50:23 +02:00
joerg@trift2.
4c11cf2dce
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-05-18 12:01:54 +02:00
jonas@perch.ndb.mysql.com
990c584e71
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-05-18 11:43:43 +02:00
jonas@perch.ndb.mysql.com
c50adc2639
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-05-18 11:40:07 +02:00
evgen@moonbone.local
835189cb85
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/28261-bug-5.0-opt-mysql
2007-05-18 13:39:34 +04:00
jonas@perch.ndb.mysql.com
be3342cf7c
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-05-18 11:37:30 +02:00
jonas@perch.ndb.mysql.com
2c60a173ab
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-18 11:36:24 +02:00
jonas@perch.ndb.mysql.com
aa2d7a3f3b
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2007-05-18 11:35:24 +02:00
jonas@perch.ndb.mysql.com
3019b64801
ndb - bug#28443
...
review comment 2, atleast 1 signal need for test prg
2007-05-18 11:34:57 +02:00
jonas@perch.ndb.mysql.com
01bace0468
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-05-18 11:17:27 +02:00
jonas@perch.ndb.mysql.com
f975b3e398
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-05-18 11:16:47 +02:00
jonas@perch.ndb.mysql.com
2457643b40
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-18 11:10:04 +02:00