evgen@moonbone.local
3415fae789
Fix bug#11325 Wrong date comparison in views
...
Wrong comparing method were choosen which results in false comparison.
Make Item_bool_func2::fix_length_and_dec() to get type and field from
real_item() to make REF_ITEM pass the check.
2005-06-24 20:16:52 +04:00
sergefp@mysql.com
2942b06a2c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-23 19:41:42 +02:00
sergefp@mysql.com
f1085fb3be
Merge
2005-06-23 19:05:36 +02:00
igor@rurik.mysql.com
4f93e84103
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-23 04:10:42 -07:00
sergefp@mysql.com
d66770b5e6
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-back-vac-look
2005-06-23 11:10:41 +00:00
igor@rurik.mysql.com
893c6c9b46
opt_range.cc:
...
Fixed buf #11487 .
Added a call of QUICK_RANGE_SELECT::init to the
QUICK_RANGE_SELECT::reset method. Without it the second
evaluation of a subquery employing the range access failed.
subselect.result, subselect.test:
Added a test case for bug #11487 .
2005-06-23 02:08:30 -07:00
evgen@moonbone.local
dc65464688
insert_update.result, insert_update.test, sql_base.cc:
...
Fix for bugfix #9728 merge
2005-06-23 03:51:10 +04:00
evgen@moonbone.local
5c8e3341d3
Bug #9728 fix merge
2005-06-23 01:02:43 +04:00
elliot@mysql.com
776fc4364f
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge2
...
into mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:31 -04:00
elliot@mysql.com
7ddb53c9c4
Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:30 -04:00
sergefp@mysql.com
7e7987eed9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-22 19:07:29 +02:00
elliot@mysql.com
201f3a7865
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge
...
into mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:29 -04:00
evgen@moonbone.local
473d7d59a7
Fix for bug #10886 merge
2005-06-22 21:07:28 +04:00
sergefp@mysql.com
aef810cbba
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-22 17:34:15 +02:00
bell@sanja.is.com.ua
a4a7735b33
merge
2005-06-22 08:42:03 +03:00
bell@sanja.is.com.ua
ebe9b54871
make test result repeatable
2005-06-22 08:38:28 +03:00
evgen@moonbone.local
2235ea9593
Fix bug #9728 decreased functionality in "on duplicate key update"
...
Remove changes made by bug fix #8147 . They strips list of insert_table_list to
only insert table, which results in error reported in bug #9728 .
Added flag to Item to resolve ambigous fields reported in bug #8147 .
2005-06-22 07:18:42 +04:00
bell@sanja.is.com.ua
f8c237bd4a
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-22 03:48:26 +03:00
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
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
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
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
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