aelkin/elkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi
9d007a2773
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras-fe36f900-97.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/pushed.bug24998_insert_delayed_many_rows
2007-01-14 19:19:58 +02:00
aelkin/elkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi
682af9cb3b
Bug#24998 rpl_row_delayed_ins.test fails in pushbuild
...
forgotten to push changed results
2007-01-14 19:15:59 +02:00
joerg@trift2.
f5c4d92d82
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/tmp-5.1
2007-01-14 13:50:16 +01:00
lars/lthalmann@dl145h.mysql.com
77c4b08fd1
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-13 15:08:42 +01:00
kostja@bodhi.local
16d53afcd2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-01-12 22:06:46 +03:00
kostja@bodhi.local
7c298786f1
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-12 22:01:53 +03:00
kostja@bodhi.local
5a99ffdf92
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-12 21:59:17 +03:00
malff/marcsql@weblab.(none)
eda8c901f4
Fixed windows build break
2007-01-12 10:33:44 -07:00
joerg@trift2.
ba876c4278
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-01-12 16:16:17 +01:00
malff/marcsql@weblab.(none)
b73101af15
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-22687
2007-01-12 08:11:52 -07:00
kostja@bodhi.local
a7862496ce
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2007-01-12 18:06:43 +03:00
joerg@trift2.
4ffada35bf
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into trift2.:/MySQL/M41/mysql-4.1
2007-01-12 14:40:28 +01:00
lars/lthalmann@dl145j.mysql.com
1e356251a0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-12 12:31:44 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c380de50ef
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-01-12 12:22:54 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
22398faa91
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-01-12 12:21:44 +01:00
gluh@eagle.(none)
90c7557266
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-12 15:08:40 +04:00
gluh@eagle.(none)
5c5edbdd82
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-12 14:48:59 +04:00
gluh@eagle.(none)
cf41e1ec63
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-12 14:47:11 +04:00
tnurnberg@mysql.com/sin.azundris.com
90a8092660
Bug#24660: "enum" field type definition problem
...
ENUMs weren't allowed to have character 0xff, a perfectly good
character in some locales. This was circumvented by mapping 0xff in
ENUMs to ',', thereby prevent actual commas from being used. Now if
0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an
error.
Any solution would have broken some sort of existing behaviour. This
solution should serve both fractions (those with 0xff and those with
',' in their enums), but WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE
WITH 0xff IN THEIR ENUMS. :-/ That is, mysqldump with their current
server, and restore when upgrading to one with this patch.
2007-01-12 11:06:38 +01:00
gluh@mysql.com/eagle.(none)
6d5cf25d20
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2007-01-12 13:58:08 +04:00
gluh@mysql.com/eagle.(none)
c081e28ef5
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2007-01-12 13:57:40 +04:00
gluh@mysql.com/eagle.(none)
a33f2719e2
Function mysql_rm_tmp_tables():
...
fixed valgrind error
fixed indentation
2007-01-12 13:34:33 +04:00
joerg@trift2.
59e2133e00
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-01-12 10:17:39 +01:00
mmj@tiger.mmj.dk
86890b8919
mysql_explain_log.sh:
...
Patch from Paul DuBois for better help messages
2007-01-12 01:04:39 +01:00
tnurnberg@sin.azundris.com
c8bc42ccff
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/tnurnberg/work/mysql-5.1-maint-24660
2007-01-12 00:15:22 +01:00
mmj@tiger.mmj.dk
ebb4885357
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
2007-01-11 23:05:13 +01:00
aelkin/elkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi
5ee04ffa08
Bug #24998 rpl_row_delayed_ins.test fails in pushbuild
...
The test uses show binlog event which is not deterministic due to the single insert delayed
query can generate up to number of inserted rows row-events pair (table_map + Write_row)
The solution is to leave the current binlogging behaviour as it is and change
the test as spliting arguments of insert delayed query. Note, that such fix was applied
earlier for binlog_insert_delayed.test :
https://intranet.mysql.com/secure/apps/irclog.php?channel=22&start_time=2006-09-27
There are no tests with insert delayed and show binlog events combination requiring
this fix.
2007-01-11 23:59:12 +02:00
malff/marcsql@weblab.(none)
9655f5fb03
Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)
...
According to some internal communication, these two functions are place
holders for future enhancements. Because they use a variable number of
parameters, the implementation defined a reserved keyword for them in the
parser grammar.
Unfortunately, doing so creates a bug similar to Bug 21114 reported for the
function FORMAT.
In the 5.1 code base, due to improvements in the code implemented with bug
21114, having a reserved keyword for functions with a variable number of
arguments is not needed any more by the implementation.
As a result, this fix removes the place-holder implementation, and removes
the unnecessary reserved keywords. Should the functions UNIQUE_USERS and
GROUP_UNIQUE_USERS be finally implemented in a later release, the
implementation should sub class Create_native_func in sql/item_create.cc.
For example, see the class Create_func_concat.
2007-01-11 14:58:05 -07:00
tsmith@siva.hindu.god
bc0e0ba7cc
Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build
...
into siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
2007-01-11 13:50:48 -07:00
cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa
2706b3d737
Revert to old behavior. Including code to verify that a cluster is not
...
readonly seems like a good idea, but the test suite isn't expecting those
statements in some places.
Figure out how we want to use this code later.
2007-01-11 14:54:03 -05:00
joerg@trift2.
d90427abaa
Merge trift2.:/MySQL/M50/tmp-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-01-11 20:43:43 +01:00
joerg@trift2.
759b66479c
Merge trift2.:/MySQL/M50/tmp1-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-01-11 20:20:43 +01:00
kostja@bodhi.local
b72c2771dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-01-11 22:15:20 +03:00
kostja@bodhi.local
61a4d6e5ed
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-11 22:09:48 +03:00
kostja@bodhi.local
bf1005a125
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-11 21:59:28 +03:00
kostja@bodhi.local
dd03d51f22
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2007-01-11 21:49:52 +03:00
joerg@trift2.
05d161e04c
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-01-11 19:40:05 +01:00
joerg@trift2.
f3025c1122
Merge mysqldev@production.mysql.com:my/mysql-4.0-15815
...
into trift2.:/MySQL/M40/mysql-4.0
2007-01-11 19:17:27 +01:00
mysqldev@mysql.com/production.mysql.com
eb18787c81
Merge mysqldev@quadxeon:/benchmarks/ext3/TOSAVE/tsmith/bk/g40
...
into mysql.com:/data0/mysqldev/my/mysql-4.0-15815
2007-01-11 19:04:36 +01:00
gkodinov/kgeorge@rakia.gmz
7eebacadad
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt
2007-01-11 19:13:04 +02:00
gkodinov/kgeorge@macbook.gmz
15bcf13182
BUG#25106: A USING clause in combination with a VIEW results in column
...
aliases ignored
When a column reference to a column in JOIN USING is resolved and a new
Item is created for this column the user defined name was lost.
This fix preserves the alias by setting the name of the new Item to the
original alias.
2007-01-11 19:10:01 +02:00
joerg@trift2.
671028a44c
Merge trift2.:/MySQL/M40/clone-4.0
...
into trift2.:/MySQL/M40/mysql-4.0
2007-01-11 17:53:38 +01:00
malff/marcsql@weblab.(none)
f043c7c4bf
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-25183
2007-01-11 09:15:44 -07:00
cbell/Chuck@suse.vabb.com
baf4272152
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl
2007-01-11 11:12:31 -05:00
cmiller@zippy.cornsilk.net
9ff7d182e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:44:39 -05:00
cmiller@zippy.cornsilk.net
896e2623eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05:00
thek@kpdesk.mysql.com
85c33ace3f
Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
2007-01-11 15:25:13 +01:00
thek@kpdesk.mysql.com
36fc42cb10
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2007-01-11 15:23:34 +01:00
thek@kpdesk.mysql.com
965aa4c74f
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2007-01-11 15:21:06 +01:00
thek@kpdesk.mysql.com
75d91dedac
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2007-01-11 15:16:33 +01:00