evgen@moonbone.local
30a0ad3a68
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-11298
2005-06-22 04:48:25 +04:00
evgen@moonbone.local
5097c6825e
Fix bug#11298 insert into select from VIEW produces incorrect result
...
when using ORDER BY
Insert were inserting data from last record fetched instead of inserting from
temporary table.
Make Item_ref to save data from result_field if it's available rather then
from *ref on save_in_field() call.
2005-06-22 04:45:10 +04:00
bell@sanja.is.com.ua
a05e50e29e
fixed items cleunup for SP (BUG#10136)
2005-06-22 00:17:08 +03:00
elliot@mysql.com
a24336cdcb
BUG#10442 Minor changes from code review
2005-06-21 15:40:58 -04:00
elliot@mysql.com
2eb7301081
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/Users/emurphy/src/work/mysql-4.1-bug10442
2005-06-21 14:28:55 -04:00
evgen@moonbone.local
b625e43485
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/mysql-4.1-bug-10886
2005-06-21 22:25:49 +04:00
evgen@moonbone.local
dc381ea960
Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results
...
Temporary field wasn't restored to default values after ON DUPLICATE KEY
UPDATE event, which results in wrong data being inserted in new record.
2005-06-21 22:24:58 +04:00
bell@sanja.is.com.ua
93d0763b70
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-06-21 20:44:18 +03:00
bell@sanja.is.com.ua
a7ca9cb38e
fixed view fields names check and generation (changed after Trudy review: underlying field names treat as user set ones) (BUG#7448)
2005-06-21 20:30:48 +03:00
igor@rurik.mysql.com
a626ab4c96
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-21 10:15:22 -07:00
evgen@moonbone.local
e7e5cb29cb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-7422
2005-06-21 21:15:20 +04:00
evgen@moonbone.local
e94f16a125
Fix bug #7422 "order by" doesn't work
...
Field with wrong buffer was used to make sort key, which results in producing
same sort key for all records.
2005-06-21 20:14:50 +04:00
monty@mishka.local
1524cd001d
Cleanup during review of new code
...
Fixed wrong allocation that could cause buffer overrun when using join cache
2005-06-21 18:18:58 +03:00
igor@rurik.mysql.com
6a721d03d6
group_by.result, group_by.test:
...
Correction for the test case of bug #11295 to remove
warning.
2005-06-21 08:15:49 -07:00
igor@rurik.mysql.com
295645b688
Manual merge
2005-06-21 06:26:02 -07:00
igor@rurik.mysql.com
3bfe28e9bf
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-21 06:19:06 -07:00
msvensson@neptunus.(none)
ddeaf342a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0
patch
2005-06-21 14:19:56 +02:00
igor@rurik.mysql.com
bb944aa9dc
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
2005-06-21 04:31:07 -07:00
igor@rurik.mysql.com
2104e9e668
group_by.result, group_by.test:
...
Added a test case for bug #11295 .
item_buff.cc:
Fixed bug #11295 .
This a correction for the patch of bug #11088 that takes into
account a possible NULL values of the BLOB column.
2005-06-21 04:24:21 -07:00
mskold@mysql.com
2716e772d4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-21 10:35:22 +02:00
mskold@mysql.com
981e845d8f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-21 08:59:37 +02:00
jimw@mysql.com
99e35c84ac
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-20 15:02:45 -07:00
jimw@mysql.com
f36ee2a96d
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 14:48:04 -07:00
kent@mysql.com
9c79bc7e73
Merge
2005-06-20 22:31:25 +02:00
jimw@mysql.com
27eace6304
Merge jwinstead@production.mysql.com:my/mysql-4.1-7858
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 12:04:22 -07:00
igor@rurik.mysql.com
28214f3da8
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-20 10:52:38 -07:00
igor@rurik.mysql.com
acc6651d24
group_by.result:
...
Added a test case for bug #11385 .
group_by.test:
Added a test case for bug #11385 .
field.h:
Fixed bug #11385 .
The bug was due to not defined method decimals for the class
Field_datetime.
2005-06-20 10:49:04 -07:00
jimw@mysql.com
4429756e53
Fix crash when an entry was added to the mysql.tables_priv
...
table with an empty hostname. (Bug #11330 )
2005-06-20 10:21:35 -07:00
mskold@mysql.com
91c422e029
Merge
2005-06-20 18:02:47 +02:00
mskold@mysql.com
777ec78755
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-20 16:13:34 +02:00
dlenev@mysql.com
e28264d29f
Manual merge of patch for bug#11060 "Server crashes on calling stored
...
procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
2005-06-20 16:58:02 +04:00
dlenev@mysql.com
b5b3b32d0a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
2005-06-20 16:07:36 +04:00
dlenev@brandersnatch.localdomain
d07843efd9
Fix for bug #11060 "Server crashes on re-execution of prepared
...
INSERT ... SELECT with UNION" (reviewed version).
Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.
2005-06-20 16:07:00 +04:00
bell@sanja.is.com.ua
02cac1c5e6
fixed time_format printing (BUG#7521)
2005-06-20 14:56:17 +03:00
msvensson@neptunus.(none)
73c1578f15
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug10365
2005-06-20 13:08:45 +02:00
msvensson@neptunus.(none)
6282d89b0a
bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.
...
- Print warning that says display width is not supported for datatype TIMESTAMP, if user tries to create a TIMESTAMP column with display width.
- Use display width for TIMESTAMP only in type_timestamp test to make sure warning is displayed correctly.
2005-06-20 12:09:00 +02:00
sergefp@mysql.com
ef85deab92
Fix for BUG#10151: In Item_func_case::find_item don't assume that parameter str != &(this->str_value)
2005-06-20 11:43:38 +02:00
sergefp@mysql.com
5fd19ea864
Fix for BUG#10804: allow differences in rows field in EXPLAIN output
2005-06-20 11:05:38 +02:00
sergefp@mysql.com
014fe01512
Fix for BUG#8441: in index_merge code when creating index search tuples use
...
KEY_PART_INFO::store_length, not KEY_PART_INFO::length (like range code does)
2005-06-20 08:56:37 +00:00
mskold@mysql.com
6fa3cdad5f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-20 09:37:31 +02:00
bell@sanja.is.com.ua
d75f6d74b5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-06-18 20:11:41 +03:00
jimw@mysql.com
01c690b79b
Fix information_schema test on Windows. (Bug #10844 )
2005-06-18 03:02:27 +02:00
acurtis@xiphis.org
51dd521dfc
Bug#6877 MySQL should give an error if the requested table type is not available
...
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
2005-06-17 22:14:44 +01:00
jimw@mysql.com
176143413e
Fix hang/crash with Boolean full-text search against an unindexed field for
...
which the query contained more words than we allocated space. (Bug #7858 )
2005-06-17 21:44:17 +02:00
msvensson@neptunus.(none)
daba295db0
BUG#10589: des_encrypt functionality always return NULL
...
- Push warnings if des_encrypt or des_descrypt function fails because of out of resources or wrong params.
- Push warning if des_encrypt or des_decrypt function is used when server is missing support for openssl.
- Add test func_encrypt_nossl that is tun when the server is missing support for openssl.
2005-06-17 18:07:46 +02:00
jimw@mysql.com
ec54dcb054
Fix spurious permissions problem when CONVERT_TZ() is used
...
in a multi-table update query. (Bug #9979 )
2005-06-17 08:56:04 -07:00
elliot@mysql.com
0c71508759
BUG#10442 Fix replication slave crash when a query with multiupdate and
...
subselects is used.
2005-06-17 11:15:29 -04:00
bell@sanja.is.com.ua
a11677026f
fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387)
2005-06-17 17:27:47 +03:00
mskold@mysql.com
dc5e1444a0
Fix for bug#10936: Cluster engine shows wrong key value for duplicate key error
2005-06-17 14:45:54 +02:00