Commit graph

40403 commits

Author SHA1 Message Date
df@kahlann.erinye.com
5fb072b0fc Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
into  kahlann.erinye.com:/home/df/mysql/build/51
2006-11-14 14:31:36 +01:00
df@kahlann.erinye.com
cc129e6256 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-14 14:29:58 +01:00
df@kahlann.erinye.com
a863fbbf41 make dist now copies .test files in mysql-test/include 2006-11-14 14:29:05 +01:00
joerg/mysqldev@mysql.com/production.mysql.com
2ddb61eb93 Raise version number after cloning 5.0.30 2006-11-14 13:37:10 +01:00
joerg@trift2.
d22948a193 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/mysql-5.0
2006-11-14 12:47:53 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
a7c31fa761 Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50_1
2006-11-14 13:04:40 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
650a245568 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
ver 5.0 and 5.1 refinement.
adding to the MAX_SIZE_LOG_EVENT_STATUS estimation status vars and 
EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN
2006-11-14 12:48:17 +02:00
msvensson@neptunus.(none)
d54846ab3e Modify search path for mysql_client_test to look in "bin" not to look for "bin",
this caused mysql_client_test to fail when running from binary dist
2006-11-13 20:44:22 +01:00
lars@black.(none)
07ac3d3a95 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 17:59:51 +01:00
lars@mysql.com/black.(none)
7aa562ad20 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 17:54:01 +01:00
mats@romeo.(none)
b1a0052e71 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
2006-11-13 15:48:39 +01:00
mats@romeo.(none)
851041ec3d Fixing problem in injector code making NDB tests fire an assertion. 2006-11-13 15:42:01 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
d615edba34 configure.in:
Raise version number after cloning 5.1.13
2006-11-13 14:50:38 +01:00
gkodinov/kgeorge@rakia.gmz
e347eb1995 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt
2006-11-13 15:40:19 +02:00
gkodinov/kgeorge@macbook.gmz
cd7613b265 merge 4.1->5.0 of the test suite for bug 19216 2006-11-13 15:37:04 +02:00
lars@black.(none)
81a853eb87 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 13:10:03 +01:00
lars@black.(none)
63c906f749 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 12:45:31 +01:00
lars@mysql.com/black.(none)
c5d56416ba Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 12:44:53 +01:00
lars@mysql.com/black.(none)
de01754c19 Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-11-13 12:44:24 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
2b2529de79 WL#3368 mixed binlog_format default
An amendment for parsing argument in case NDB is compiled and active.
  NDB switches from mixed to row-based and back per each query. The previous patch
  was not aware of such behaviour and made exceptional assingment to row-based when
  no command line arg --binlog-format provided.
  
  Removing #if HAVE_NDB_BINLOG block alltogether: ndb supports mixed and if server 
  was build without NDB using binlog nothing to care.
  Test for this piece of code is rather specific. While there is active bug23110
  ndb_alter_table and some other should fail if no explict --binlog-format is given:
  mysql-test-run ndb_alter_table
2006-11-13 13:20:35 +02:00
joerg@trift2.
5057fa01f4 support-files/mysql.spec.sh : Make the server report its features in the first test run. 2006-11-13 12:10:12 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
7b0eb936d1 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50
2006-11-13 12:45:47 +02:00
gkodinov/kgeorge@macbook.gmz
d6672f711d Merge macbook.gmz:/Users/kgeorge/mysql/work/B19216-4.1-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/B19216-5.0-opt
2006-11-13 12:44:56 +02:00
gkodinov/kgeorge@macbook.gmz
9a41822bdd Bug #19216: Client crashes on long SELECT
The server sends a number of columns to the client.
 It uses a limited "fast" function for that instead of the
 general one. This fast function cannot send numbers larger 
 than 2 bytes. 
 This causes the client to expect smaller number of columns. 
 The client writes outside of the allocated memory buffer 
 as a result.
 Fixed the server to use the general function to send column
 count.
 Fixed the client to check the column count before writing
 column data.
2006-11-13 12:28:55 +02:00
joerg@trift2.
ccadac3267 Build the generic RPMs including the "partition" feature. bug#23949 2006-11-13 11:10:27 +01:00
kostja@bodhi.local
f5d2077061 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-11-12 23:48:59 +03:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5a20c54201 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
comments are fixed as was suggested in reviews.
2006-11-12 20:01:58 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
eb28e03189 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0
2006-11-12 18:04:19 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
fe5de9f5c3 Correcting BUG/WL identifier extraction to allow multiple references to auxilary
bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
the first in the comments. The referred bugs wls can be typed in same as the targeted
clickable format.
If the the target of the fix is a WL and there are some references to bugs
then the first found reference is regarded as "co-target" so that the bug's identifier
comes up on the subject line along with the WL's and commit mail will update
the bug page. The latter feature can be disarmed (if there is no need to update
the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).

This paticular cset will generate subject line containing bug#0 (as it was the first
referred) whereas the old version would put in the subject line the last referred
pattern (e.g bug#2147483648).
2006-11-12 13:38:13 +02:00
kostja@bodhi.local
c1f0ef538a Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-11-12 10:56:10 +03: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@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
746ece99e0 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
2006-11-11 14:46:06 +01: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
de170fb332 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-11-11 14:59:14 +03: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
joerg@trift2.
ca06382435 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2006-11-10 20:02:33 +01:00
tsmith@quadxeon.mysql.com
ce805aff3f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-10 19:41:47 +01:00
tsmith@quadxeon.mysql.com
82b6712a27 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-10 19:39:26 +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
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
d3976edabe Bug #24190 many exportable definitions of field_in_record_is_null
mysql had several(2) exportable definitions of field_in_record_is_null function.

Fixed with adding static.
2006-11-10 17:22:43 +02: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
abd8eeaaa7 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
into  kahlann.erinye.com:/home/df/mysql/build/51
2006-11-10 13:27:50 +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