mskold/marty@mysql.com/linux.site
a40f5dfbac
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-14 11:38:57 +01:00
mskold/marty@mysql.com/linux.site
7c3cb3d86d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-14 10:06:11 +01:00
hartmut@mysql.com/linux.site
639683919d
Fix for Bug #23887 (Introduced by Bugfix #22295 )
2006-11-13 17:04:40 +01:00
mskold/marty@mysql.com/linux.site
b045a81516
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-13 12:58:26 +01:00
kostja@bodhi.local
0f455a81dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-12 10:55:33 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1319f3552c
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-11-11 14:32:10 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
cddbb0f817
mysql-test-run.pl:
...
Test for base directory when a RPM install corrected
2006-11-11 14:12:30 +01:00
kostja@bodhi.local
0cdaa7c138
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-11 14:51:19 +03:00
joerg@trift2.
a19a5b5f03
Merge trift2.:/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-11-10 20:24:05 +01:00
tsmith@quadxeon.mysql.com
b2da711fbf
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
2006-11-10 19:38:07 +01:00
joerg@trift2.
e47f753a85
Merge trift2.:/MySQL/M50/bug24023-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-11-10 19:11:26 +01:00
joerg@trift2.
32d9fdaa98
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2006-11-10 19:07:52 +01:00
joerg@trift2.
743ab0c6a4
Merge trift2.:/MySQL/M41/bug17194-4.1
...
into trift2.:/MySQL/M41/push-4.1
2006-11-10 15:54:58 +01:00
joerg@trift2.
2ab3d0bfb4
Merge trift2.:/MySQL/M41/clone-4.1
...
into trift2.:/MySQL/M41/push-4.1
2006-11-10 15:52:53 +01:00
df@kahlann.erinye.com
a185c4f6ea
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
2006-11-10 14:49:07 +01:00
df@kahlann.erinye.com
403ecf18c6
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-10 14:44:01 +01:00
df@kahlann.erinye.com
59e33edf22
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-10 13:14:21 +01:00
df@kahlann.erinye.com
f1764fa99f
add --report-features to mysql-test-run.pl
2006-11-10 13:12:08 +01:00
petr/cps@outpost.site
e06f74f9f9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
2006-11-10 15:05:38 +03:00
ted@ted.mysql.internal
bc9ca699fb
Memory allocation bug fixed
2006-11-10 07:21:10 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
54f6fc07b9
Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-11-10 02:35:01 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
264beeff86
Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic
...
into mysql.com:/Users/kent/mysql/bk/lic/my50-lic
2006-11-10 02:28:31 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f893128839
mysql-test-run.sh:
...
Added --force-restart pseudo server argument to shell version as well
2006-11-10 02:22:33 +01:00
joerg@trift2.
dce6efd035
mysql-test/install_test_db.sh
...
Adapt to the different path of the server program, if installation was by RPM.
Missing in the first changeset for bug#17194.
2006-11-09 17:43:31 +01:00
tsmith@quadxeon.mysql.com
e9b42a4b27
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50
2006-11-09 05:21:56 +01:00
tsmith@quadxeon.mysql.com
c2aca91b7f
This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33
...
Fixes:
- Bug #24089 : Race condition in fil_flush_file_spaces()
2006-11-09 05:03:35 +01:00
tsmith@quadxeon.mysql.com
f1e0cf9d28
This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003
...
Fixes:
- Bug #15815 : Very poor performance with multiple queries running concurrently
- Bug #22868 : 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #23769 : Debug assertion failure with innodb_locks_unsafe_for_binlog
- Bug #24089 : Race condition in fil_flush_file_spaces()
2006-11-09 05:02:37 +01:00
tsmith@quadxeon.mysql.com
41117b1226
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
2006-11-09 00:53:22 +01:00
tsmith@quadxeon.mysql.com
246ec19117
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
2006-11-09 00:47:48 +01:00
tsmith@quadxeon.mysql.com
f663ba45e5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
2006-11-09 00:26:22 +01:00
msvensson@neptunus.(none)
f032a223b7
Fix warnings and NetWare compile failure
2006-11-09 00:17:22 +01:00
msvensson@neptunus.(none)
0ec6432636
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-08 23:24:16 +01:00
msvensson@neptunus.(none)
a620a3abd1
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-08 23:17:09 +01:00
msvensson@neptunus.(none)
90d8d7b5cf
Update of --mem flag after comments
2006-11-08 23:16:44 +01:00
msvensson@neptunus.(none)
174bfe9dd6
No need to pass an additional arg to to mtr_add_arg when there is no % sign
2006-11-08 22:56:06 +01:00
msvensson@neptunus.(none)
4dfbc712ed
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-08 22:54:22 +01:00
msvensson@neptunus.(none)
1437500c1b
Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine.
2006-11-08 22:53:40 +01:00
msvensson@neptunus.(none)
34f2c99dfc
Don't run mysqltest with both --silent and --verbose
2006-11-08 22:45:52 +01:00
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
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
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
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
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
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@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