joerg@trift2.
82f33033c3
Merge trift2.:/MySQL/M41/bug24023-4.1
...
into trift2.:/MySQL/M50/bug24023-5.0
2006-11-08 21:46:28 +01:00
joerg@trift2.
31bd60a3a7
Merge trift2.:/MySQL/M41/bug24023-4.1
...
into trift2.:/MySQL/M41/clone-4.1
2006-11-08 21:27:58 +01:00
joerg@trift2.
73541fe8b2
Merge trift2.:/MySQL/M41/bug17194-4.1
...
into trift2.:/MySQL/M41/clone-4.1
2006-11-08 21:22:52 +01:00
anozdrin/alik@alik.
9421205b49
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt
2006-11-08 22:20:58 +03:00
bar@bar.intranet.mysql.r18.ru
41a324ea3a
Merge mysql.com:/usr/home/bar/mysql-5.0.b23451
...
into mysql.com:/usr/home/bar/mysql-5.1.b23451
2006-11-08 22:14:36 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9870d87f25
after merge fix for bug 23451.
2006-11-08 22:08:50 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
bd2529d0a1
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1-rpl
...
into mysql.com:/usr/home/bar/mysql-4.1.b23451v2
2006-11-08 22:03:08 +04:00
cmiller@zippy.cornsilk.net
d9845ccfd2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-08 10:19:02 -05:00
cmiller@zippy.cornsilk.net
c6b028404d
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-08 10:18:16 -05:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
37c78abf24
bug#19402 SQL close to the size of the max_allowed_packet fails on slave
...
fixing a flow of the test
2006-11-08 17:17:28 +02:00
cmiller@zippy.cornsilk.net
f05faf34af
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963
2006-11-08 10:12:06 -05:00
cmiller@zippy.cornsilk.net
6260e12b99
Bug#10963: LEFT/RIGHT/SUBSTR/.. string functions returns wrong result \
...
on large length
Problem: Most (all) of the numeric inputs were being coerced into
int (32 bit) sized variables. Works OK for sane inputs; any input
larger than 2^32 (or 2^31 for signed vars) exihibited predictable
wrapping behavior (up to about 10^18) and then started having really
strange behaviour past that point (since the conversion to 64 bit int
from the DECIMAL type can do weird things on out of range numbers).
Solution: 1) Add many tests. 2) Convert input from (u)long type to
(u)longlong. 3) Do (sometimes multiple) sanity checks on input,
keeping in mind that sometimes a negative longlong is not a negative
longlong (if the unsigned_flag is set). 4) Emulate existing behavior
w/rt negative and "small" out-of-bounds values.
2006-11-08 10:11:02 -05:00
mats@romeo.(none)
a932160a85
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
2006-11-08 14:07:13 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
ac3ce653b4
Merge mysql.com:/usr/home/bar/mysql-4.1.b23451v2
...
into mysql.com:/usr/home/bar/mysql-5.0.b23451
2006-11-08 17:03:37 +04:00
mats@romeo.(none)
ddd27b4093
Fixes to make rpl_ndb_dd_advance pass.
2006-11-08 13:55:33 +01:00
msvensson@neptunus.(none)
1717e280e0
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-11-08 11:40:33 +01:00
msvensson@neptunus.(none)
99277888dc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-08 11:36:51 +01:00
msvensson@neptunus.(none)
51c75a03ba
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-08 11:34:34 +01:00
msvensson@neptunus.(none)
a1d764f8ba
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-08 11:32:07 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
7425499e8e
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/4.1/bug19402-max_allowed
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-4.1-rpl
2006-11-08 09:57:20 +02:00
ted@ted.mysql.internal
fbedcdc09d
Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
2006-11-08 06:16:12 +03:00
ted@ted.mysql.internal
b29fb42bca
Merge ted.mysql.internal:/home/ted/src/mysql/50-gca
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
2006-11-08 06:12:26 +03:00
ted@ted.mysql.internal
09925858de
Merge ted.mysql.internal:/home/ted/src/mysql/50-gca
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
2006-11-08 05:47:44 +03:00
ted@ted.mysql.internal
3e6735e277
BUG#20100 fix: mysql_upgrade modified to also accept all
...
the communication parameters from the command line
and pass 'em correctly to both mysqlcheck and mysql
2006-11-08 05:45:50 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e30668f61a
Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-11-07 23:28:55 +01:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e209edaa32
Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic
...
into mysql.com:/Users/kent/mysql/bk/lic/my51-lic
2006-11-07 23:01:38 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1d932b992c
Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic
...
into mysql.com:/Users/kent/mysql/bk/lic/my50-lic
2006-11-07 22:55:19 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
7364bc113e
Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic
...
into mysql.com:/Users/kent/mysql/bk/lic/my41-lic
2006-11-07 22:49:46 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3d7a9bdd6b
make_binary_distribution.sh:
...
Added LICENSE.mysql, removed LICENSE.doc README.NW.
Removed obselete section about MySQLEULA.txt and README.NW.
README:
Added reference to the EXCEPTIONS-CLIENT file.
Changed reference to the commercial license file.
Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
Delete: Docs/MySQLEULA.txt
2006-11-07 22:26:37 +01:00
petr/cps@outpost.site
fb650b8aad
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime
2006-11-08 00:07:23 +03:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
016c4b1616
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1
2006-11-07 20:45:43 +01:00
lars/lthalmann@dl145h.mysql.com
3776e9622b
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-11-07 19:26:31 +01:00
msvensson@neptunus.(none)
f28c36d079
Bump version to 5.0.30
2006-11-07 18:21:52 +01:00
msvensson@neptunus.(none)
6bc6064ec4
Update result file after having changed error message
2006-11-07 17:42:15 +01:00
msvensson@neptunus.(none)
c64f5c7931
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 16:17:54 +01:00
msvensson@neptunus.(none)
ad63d2bdbe
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 16:17:04 +01:00
msvensson@neptunus.(none)
f5550c3304
Bug#23981 memory leaks from yassl code + other
...
- Readd --skip-bdb when valgrinding
2006-11-07 16:09:32 +01:00
joerg@trift2.
f15d3d8a71
Fix bug#24023: Let "ndb/src/common/portlib/gcc.cpp" export a dummy symbol.
2006-11-07 16:01:54 +01:00
msvensson@neptunus.(none)
ffa100d2d0
Bug#23981 memory leaks from yassl code + other
...
- Fix memory leak in vio_VioSSLFD that occurs when one of the calls to SSL_* function fails. As in the "ssl_des"
test case where the server is currently not supposed to be able to read the specific cert/key file.
- Change error message to be generic as it's called both from server and client code.
2006-11-07 15:20:24 +01:00
anozdrin/alik@alik.
6b0e7f3e4e
Automerge fix.
2006-11-07 16:25:57 +03:00
anozdrin/alik@alik.
ee15c11b7c
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
2006-11-07 16:24:35 +03:00
msvensson@neptunus.(none)
7b1add1abe
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 13:02:35 +01:00
msvensson@neptunus.(none)
2d952d336e
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 13:01:56 +01:00
msvensson@neptunus.(none)
a3602ca86d
Don't allow path to be passed to --mem
2006-11-07 13:01:32 +01:00
msvensson@neptunus.(none)
3485b33453
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 12:58:24 +01:00
msvensson@neptunus.(none)
546250e244
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 12:57:30 +01:00
msvensson@neptunus.(none)
eea46ce15b
Correct faulty commit, the opt_tastcase_timeout value is in minutes, to it need to be multiplied with 60 before ping passed to mtr_timer_start
2006-11-07 12:56:55 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
aea1e14ef8
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-11-07 12:02:53 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
db8aa4ab6c
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-11-07 12:00:55 +01:00
anozdrin/alik@alik.
ab280f3f88
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0
...
into alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
2006-11-07 13:50:00 +03:00