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
gkodinov/kgeorge@rakia.gmz
0be7e70399
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B20191-5.0-opt
2006-11-09 18:03:49 +02:00
gkodinov/kgeorge@macbook.gmz
e7ff881c6b
Bug #20191 : getTableName gives wrong or inconsistent result when using VIEWs
...
When compiling GROUP BY Item_ref instances are dereferenced in
setup_copy_fields(), i.e. replaced with the corresponding Item_field
(if they point to one) or Item_copy_string for the other cases.
Since the Item_ref (in the Item_field case) is no longer used the information
about the aliases stored in it is lost.
Fixed by preserving the column, table and DB alias on dereferencing Item_ref
2006-11-09 16:55:42 +02:00
holyfoot/hf@mysql.com/deer.(none)
129fbca293
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/8663/my50-8663
2006-11-09 16:08:31 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
aa1c8a5826
Bug#21505 Create view - illegal mix of collation for operation 'UNION'
...
The problem was that any VIEW columns had always implicit derivation.
Fix: derivation is now copied from the original expression
given in VIEW definition.
For example:
- a VIEW column which comes from a string constant
in CREATE VIEW definition have now coercible derivation.
- a VIEW column having COLLATE clause
in CREATE VIEW definition have now explicit derivation.
2006-11-09 14:41:34 +04:00
gkodinov/kgeorge@macbook.gmz
edd8ea538a
Merge bk-internal:/home/bk/mysql-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-opt
2006-11-09 12:07:58 +02: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
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
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
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
gkodinov/kgeorge@macbook.gmz
1a8204f242
Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt
2006-11-08 16:41:12 +02:00
gkodinov/kgeorge@macbook.gmz
c7866bd569
Make a new test target for autopush.pl to run memory based tests
2006-11-08 15:15:56 +02: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
sergefp@mysql.com
4a00e76e7a
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-pfix
2006-11-08 14:43:17 +03: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
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
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
sergefp@mysql.com
26c30f2f7d
BUG#24056: Crash in subquery:
...
Don't assume that condition that was pushed down into subquery has
produced exactly one KEY_FIELD element - it could produce several or
none at all, handle all of those cases.
2006-11-08 02:26: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
gkodinov/kgeorge@rakia.gmz
edf194ab1f
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B11032-5.0-opt
2006-11-07 21:25:49 +02:00
msvensson@neptunus.(none)
f28c36d079
Bump version to 5.0.30
2006-11-07 18:21:52 +01:00
holyfoot/hf@mysql.com/deer.(none)
1e36f348e6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mysql-5.0.clean
2006-11-07 21:03:45 +04:00
holyfoot/hf@mysql.com/deer.(none)
9c9bf04650
bug fixed
2006-11-07 21:02:41 +04:00