Commit graph

14941 commits

Author SHA1 Message Date
mats@mysql.com
3f7b8cfb6e Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/fix-mysql-5.1-new
2006-03-07 08:40:09 +01:00
mats@mysql.com
0713aa597a Bug#17874 (Test failure: rpl_row_basic_3innodb):
Some storage engines does not set the filler bits, so we set them
  before calling the record-reading functions.
2006-03-07 08:33:20 +01:00
pem@mysql.com
a065843799 Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 19:46:17 +01:00
msvensson@neptunus.(none)
c9d14a0329 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 14:03:16 +01:00
gluh@mysql.com
7f4b27cf29 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:58:16 +04:00
msvensson@devsrv-b.mysql.com
ee97bebc8c Merge bk-internal:/home/bk/mysql-5.0
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:28:30 +01:00
kent@mysql.com
ff71af1e01 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 12:21:10 +01:00
kent@mysql.com
dfae81d014 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 12:15:26 +01:00
gluh@mysql.com
321eb3dce6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:15:23 +04:00
msvensson@devsrv-b.mysql.com
2660607096 Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:04:54 +01:00
msvensson@neptunus.(none)
e4705ea4bf Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 11:51:46 +01:00
msvensson@neptunus.(none)
40b3222b74 Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 11:39:36 +01:00
gluh@mysql.com
69e8b9d06e 4.1 -> 5.0 merge 2006-03-06 14:38:31 +04:00
gluh@eagle.intranet.mysql.r18.ru
f1eaf7e8ec Fix for bug#14385 GRANT and mapping to correct user account problems
Check if the host of table hash record exactly matches host from GRANT command
2006-03-06 14:03:40 +04:00
timour@mysql.com
593bd1d3b8 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-15229
2006-03-06 11:41:19 +02:00
mskold@mysql.com
a34be87ff3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-06 10:30:36 +01:00
mskold@mysql.com
7380a4dd22 Fix for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported 2006-03-06 10:24:06 +01:00
gluh@eagle.intranet.mysql.r18.ru
33e7d20f37 Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
calculate Item_func_format::max_length using charset->mbmaxlen
2006-03-06 12:52:38 +04:00
dlenev@mysql.com
0fb4a6645e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
2006-03-04 23:58:48 +03:00
konstantin@mysql.com
40b368af16 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-root
2006-03-04 22:33:19 +03:00
dlenev@mysql.com
efe0900669 Fix for bug #17866 "Problem with renaming table with triggers with fully
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".

The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).
2006-03-04 16:55:06 +03:00
petr@mysql.com
965fd06afa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-cleanup
2006-03-04 11:52:02 +03:00
petr@mysql.com
0a861ec8c5 Remove unused thd->options's flag -- OPTION_UPDATE_LOG
The update log itself was removed back in 5.0. Recommit
with post-review fixes.
2006-03-04 11:20:56 +03:00
pem@mysql.com
2b6f510350 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
2006-03-03 19:18:17 +01:00
pem@mysql.com
b66567f619 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release
2006-03-03 18:51:13 +01:00
pem@mysql.com
9e001880df Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 15:02:37 +01:00
ramil@mysql.com
f864fc7ee6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-03-03 17:22:20 +04:00
bar@mysql.com
7dc12415e9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16316
2006-03-03 17:00:03 +04:00
joerg@debian.(none)
e5b149d1e7 Merge joerg@trift2:/M50/patch-17595 into debian.(none):/M50/clone-5.0 2006-03-03 12:50:15 +01:00
gluh@mysql.com
ab67605976 Merge mysql.com:/home/gluh/MySQL/Merge/mysql-5.0-release
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-03 15:39:38 +04:00
ramil@mysql.com
d47b351204 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-03-03 15:32:00 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3e993d9a6 Fix for bug#17826 'type_decimal' fails with ps-protocol
removed unnecessary calculation of cache value 
 otherwise Join::preapre tries to calculate 
 undefined values(filed values)
2006-03-03 15:29:39 +04:00
pem@mysql.com
015ab71a50 Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 12:03:27 +01:00
ramil@mysql.com
1a07140515 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b17615
2006-03-03 09:35:25 +04:00
ramil@mysql.com
1301484679 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b13659
2006-03-03 09:34:40 +04:00
cmiller@zippy.(none)
c672c119e3 Expanding a binary field should result in 0x00-filled positions, not 0x20
(ASCII space).  For Bug#16857.
2006-03-02 20:49:10 -05:00
cmiller@zippy.(none)
5147bb8e9b Expanding a binary field should result in 0x00-filled positions, not 0x20
(ASCII space).  For Bug#16857.
2006-03-02 19:59:49 -05:00
andrey@lmy004.
e889e85a80 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-02 21:02:00 +01:00
SergeyV@selena.
1bacdef0a7 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#17595-mysql-5.0
2006-03-02 20:52:58 +03:00
andrey@lmy004.
9228a1c51d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-03-02 18:48:25 +01:00
andrey@lmy004.
42a93d2390 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-02 16:25:05 +01:00
pem@mysql.com
d85e929547 Fixed BUG#17476: Stored procedure not returning data when it is called first
time per connection
  Removed const_string() method from Item_string (it was only used in one
  place, in a bad way). Defer possible SP variable, and access data directly
  instead, in date_format item.
2006-03-02 14:54:04 +01:00
ramil@mysql.com
72da0c6091 Fix for bug #17615: invalid handling of function results in UPDATE...SET statement. 2006-03-02 15:05:55 +04:00
bar@mysql.com
5e2ab5f4a0 Bug#16316: XML: extractvalue() is case-sensitive with contains()
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Fixed that Item_nodeset_func derived classes
  didn't take into account charset of the XML value
  and always worked using "binary" charset.
2006-03-02 14:05:38 +04:00
msvensson@neptunus.(none)
4697536963 Make the define start at "start of line" 2006-03-02 10:55:55 +01:00
serg@serg.mylan
0022bb67cb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-03-02 10:53:01 +01:00
timour@mysql.com
103604ed06 Fix for BUG#15229.
The cause of this bug was a design flaw due to which the list of natural
join columns was incorrectly computed and stored for nested joins that
are not natural joins, but are operands (possibly indirect) of nested joins.

The patch corrects the flaw in a such a way, that the result columns of a
table reference are materialized only if it is a leaf table (that is, only
if it is a view, stored table, or natural/using join).
2006-03-02 11:50:15 +02:00
bar@mysql.com
3072df1632 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b14527
2006-03-02 13:43:26 +04:00
andrey@lmy004.
9509b440a6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-02 10:05:24 +01:00
andrey@lmy004.
d0b6c85411 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-03-02 10:03:48 +01:00