mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
640a4de065
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 15:44:15 -04:00
aelkin@mysql.com
a0b4c8ed12
Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/4.1-bug19188_tmp_name
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/4.1
2006-05-12 21:38:41 +03:00
aelkin@mysql.com
0cec36305b
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug14157-utf8_binlog
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/4.1
2006-05-12 21:33:24 +03:00
aelkin@mysql.com
9b16a7b91a
BUG#19188: incorrect temporary table name of DROP query in replication
...
A pattern to generate binlog for DROPped temp table in close_temporary_tables
was buggy: could not deal with a grave-accent-in-name table.
The fix exploits `append_identifier()' for quoting and duplicating accents.
2006-05-12 21:29:06 +03:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c85be97f50
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:22:31 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c558d9d00d
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:14:39 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14bbe2c0ee
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:11:46 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
113cc95f84
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:09:26 -04:00
acurtis@xiphis.org
9ba0ac9579
manual merge bug#10952
2006-05-12 08:50:31 -07:00
gkodinov@mysql.com
71741526a4
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B7549
2006-05-12 17:04:04 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
133f5dd6bf
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-12 16:47:43 +03:00
gluh@eagle.intranet.mysql.r18.ru
a23a8780e4
Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
...
replaced get_field(MEM_ROOT *mem, Field *field) with
get_field(MEM_ROOT *mem, Field *field, String *res).
It allows to avoid strlen().
2006-05-12 17:34:36 +05:00
jmiller@mysql.com
e9056d856d
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-12 14:28:16 +02:00
jmiller@mysql.com
375473ed95
rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test:
...
Updated per lars
rpl_row_flsh_tbls.test:
updated per lars
2006-05-12 14:09:13 +02:00
gluh@mysql.com
dd314276de
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-05-12 15:53:50 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
dcd41ec846
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-12 13:37:56 +03:00
msvensson@neptunus.(none)
20f8876f66
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-12 12:25:24 +02:00
gluh@mysql.com
60fa42cb64
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-05-12 15:10:23 +05:00
gluh@eagle.intranet.mysql.r18.ru
c8944add73
Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
2006-05-12 15:09:25 +05:00
kroki@mysql.com
0963c705cd
Bug#14635: Accept NEW.x as INOUT parameters to stored procedures
...
from within triggers
Add support for passing NEW.x as INOUT and OUT parameters to stored
procedures. Passing NEW.x as INOUT parameter requires SELECT and
UPDATE privileges on that column, and passing it as OUT parameter
requires only UPDATE privilege.
2006-05-12 13:55:21 +04:00
msvensson@neptunus.(none)
9f5c15cfa8
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 11:51:04 +02:00
aelkin@mysql.com
f7f83cd04c
Bug#19728: Test mysqldump failure
...
regex is fixed for windows.
2006-05-12 12:32:44 +03:00
tnurnberg@mysql.com
ab69fac55d
Merge mysql.com:/home/mysql-4.1-10418
...
into mysql.com:/home/mysql-5.0-10418
2006-05-12 10:27:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9dffc3cd01
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-12 11:26:42 +03:00
msvensson@neptunus.(none)
d3dd075227
Bug#19709 rpl_tmporary fails on powermacg5
...
- Don't kill the active connection to the server, instead read
the connection id, switch connection and kill the first one from there.
2006-05-12 09:13:37 +02:00
msvensson@neptunus.(none)
47a578f4e4
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 08:45:22 +02:00
igor@rurik.mysql.com
d1417ad55a
Added a test case for bug #18940:in 5.0 the optimizer chose
...
a worse execution plan than in 4.1 for some queries.
It happened due the fact that at some conditions the
optimizer always preferred range or full index scan access
methods to lookup access methods even when the latter were much
cheaper.
The problem was not observed in 4.1 for the reported query
because the WHERE condition was not of a form that could
cause the problem.
Equality propagation introduced on 5.0 added an extra
predicate and changed the WHERE condition. The new condition
provoked the optimizer to make a bad choice.
The problem was fixed by the patch for bug 17379.
2006-05-11 19:47:00 -07:00
brian@zim.(none)
b283a96933
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-11 12:51:31 -07:00
jmiller@mysql.com
11d442a1c3
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-11 21:46:10 +02:00
sergefp@mysql.com
acdc038a44
Bug#19136: Manual 5.0->5.1 merge
2006-05-11 20:41:11 +04:00
jmiller@mysql.com
f1d1c98df6
changes for when NDB is default engine
2006-05-11 18:12:06 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
af922ea812
Removed duplicate test.
2006-05-11 19:06:36 +03:00
mats@mysql.com
a431fa0765
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/b15886-mysql-5.0
2006-05-11 16:42:49 +02:00
sergefp@mysql.com
22c71d3db8
Merge mysql.com:/home/psergey/tmp_merge
...
into mysql.com:/home/psergey/mysql-5.1-merge5
2006-05-11 18:41:53 +04:00
mats@mysql.com
4045fb1285
Bug#15886 (Test: Timing issue in test "rpl_until"):
...
Changed format for SHOW SLAVE STATUS to vertical output.
2006-05-11 16:29:02 +02:00
gkodinov@mysql.com
0486cfbee2
BUG#7549: Missing error message for invalid view selection with subquery.
...
When a view statement is compiled on CREATE VIEW time, most of the
optimizations should not be done. Finding the right optimization
for a subquery is one of them.
Unfortunately the optimizer is resolving the column references of
the left expression of IN subqueries in the process of deciding
witch optimization to use (if needed). So there should be a
special case in Item_in_subselect::fix_fields() : check the
validity of the left expression of IN subqueries in CREATE VIEW
mode and then proceed as normal.
2006-05-11 15:30:54 +03:00
tnurnberg@mysql.com
133a5d17f7
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql-4.1-10418
2006-05-11 12:48:49 +02:00
mats@mysql.com
1c419c8671
Bug#17400 (CRBR: Delete and update of table w/o PK fails on slave):
...
Fixing bug where UPDATE failed on slave and some cleanup of ndb_unpack_record().
2006-05-11 11:09:58 +02:00
kroki@mysql.com
0499b30151
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-05-11 11:28:56 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
8a3d5e8f4f
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-11 04:20:07 +03:00
tnurnberg@mysql.com
9cd4c070c1
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql-5.0-19263
2006-05-11 01:18:15 +02:00
brian@zim.(none)
d1c9c2c5b2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-10 14:14:51 -07:00
msvensson@neptunus.(none)
14a6cacec4
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 21:44:11 +02:00
msvensson@neptunus.(none)
41f1206b62
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 21:38:48 +02:00
msvensson@neptunus.(none)
3b9891716c
Add missing drop table
2006-05-10 21:35:05 +02:00
anozdrin@mysql.com
65b87b86a3
Fix for BUG#18587: Function that accepts and returns TEXT
...
garbles data if longer than 766 chars.
The problem is that a stored routine returns BLOBs to the previous
caller, BLOBs are shallow-copied (i.e. only pointers to the data are
copied). The fix is to also copy data of BLOBs.
2006-05-10 23:16:30 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
56b97747de
BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table.
2006-05-10 12:53:40 -04:00
ramil@production.mysql.com
31e22776c8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
2006-05-10 18:52:31 +02:00
svoj@april.(none)
ae67994fe6
BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row on
...
SELECT WHERE a= AND b=
Selecting data from memory table with varchar column and hash index over it
returns only first row matched.
Problem was that key length calculation for varchar columns didn't include
number of bytes to store length.
Fixed key length for varchar fields to include number of bytes to store length.
2006-05-10 21:50:04 +05:00
ramil@production.mysql.com
aacd04789a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
2006-05-10 17:09:15 +02:00