msvensson@neptunus.(none)
58980a2cbe
Merge problem fixes
2005-06-27 12:25:15 +02:00
msvensson@neptunus.(none)
eb41ba25e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 10:53:08 +02:00
msvensson@neptunus.(none)
13a02cfad2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-27 09:53:11 +02:00
igor@rurik.mysql.com
7994f27c43
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-25 05:45:50 -07:00
kent@mysql.com
8771dbf4cb
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-25 02:01:34 +02:00
ingo@mysql.com
4ab4ee9c7c
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
After merge fixes of test result.
2005-06-24 19:47:19 +02:00
kent@mysql.com
c12eede6ec
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-24 19:47:18 +02:00
ingo@mysql.com
1c33fbc4c1
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge.
2005-06-24 19:47:18 +02:00
evgen@moonbone.local
182c0ca5b7
Merge
2005-06-24 21:47:17 +04:00
kent@mysql.com
4a3f9666e6
mysql-test-run.pl:
...
Corrected master server id's
2005-06-24 18:23:59 +02:00
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
ingo@mysql.com
2dcf451b81
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
Moved the key statistics update to info().
The table is not locked in open(). This made wrong stats possible.
No test case for the test suite.
This happens only with heavy concurrency.
A test script is added to the bug report.
2005-06-24 17:47:09 +02:00
kent@mysql.com
5b8bac3767
mysql-test-run.sh:
...
Corrected path to CA certificate
2005-06-24 11:56:20 +02:00
ramil@mysql.com
b0e6db14c5
backport for #10568 : Function 'LAST_DAY(date)' does not return NULL for invalid argument.
2005-06-24 14:04:48 +05:00
igor@rurik.mysql.com
6f09af1d95
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-24 01:26:35 -07:00
bell@sanja.is.com.ua
c9de0b15f2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-06-24 10:05:33 +03:00
timour@mysql.com
ab72ecc5fd
Fixed test result for BUG#11185.
2005-06-24 09:56:58 +03:00
bell@sanja.is.com.ua
ec4444447f
fixed encrypt() name
2005-06-24 01:30:52 +03:00
bell@sanja.is.com.ua
f1d3f0811d
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-06-24 00:25:28 +03:00
bell@sanja.is.com.ua
3c5286c3e2
fixed encrypt() print (BUG#7024)
2005-06-24 00:24:11 +03:00
timour@mysql.com
9d1f292840
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/timka/mysql/src/5.0-virgin
2005-06-23 23:26:49 +03:00
timour@mysql.com
5237de7a71
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-06-23 22:40:04 +03:00
bell@sanja.is.com.ua
a771b57172
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-06-23 21:45:53 +03:00
igor@rurik.mysql.com
268110b34b
Manual merge
2005-06-23 11:22:30 -07:00
sergefp@mysql.com
0a5223bf8a
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-23 20:22:29 +02: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
igor@rurik.mysql.com
2a7471a6f1
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-23 10:09:01 -07:00
bell@sanja.is.com.ua
28a93877ca
temporary tables of subquery in the from clause just skipped during processing QC tables (BUG#11522)
2005-06-23 20:06:35 +03:00
msvensson@neptunus.(none)
84e5118931
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-23 19:06:35 +02:00
timour@mysql.com
1994b8b8ea
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-06-23 20:06:35 +03:00
kent@mysql.com
9e8b8f7cec
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-23 19:06:35 +02:00
igor@rurik.mysql.com
1c348f48a9
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
2005-06-23 10:06:35 -07:00
sergefp@mysql.com
f1085fb3be
Merge
2005-06-23 19:05:36 +02:00
kent@mysql.com
a4d86cf434
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-23 17:46:00 +02:00
kent@mysql.com
ffff7cb314
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-06-23 17:41:42 +02:00
kent@mysql.com
025305c1cd
mysql-test-run.pl:
...
Might need a restart after test with special TZ
Removed unused argument to run_mysqltest()
2005-06-23 17:38:40 +02:00
bell@sanja.is.com.ua
50784392aa
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-06-23 18:30:59 +03:00
bell@sanja.is.com.ua
56b2fc10a8
fixed environment restoring in case of error during SP function execution (BUG#9503)
...
#define macro improvement
2005-06-23 18:29:10 +03:00
timour@mysql.com
67646ab141
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-06-23 17:23:48 +03:00
igor@rurik.mysql.com
d09fd92535
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
2005-06-23 06:19:28 -07:00
igor@rurik.mysql.com
c73c2af614
func_str.result, func_str.test:
...
Added a test case for bug #10124 .
sql_select.h, item_subselect.cc, sql_select.cc:
Fixed bug #10124 .
The copy method of the store_key classes can return
STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now.
field.cc:
Fixed bug #10124 .
When ussuing a warning the store methods return 2 instead of 1 now.
2005-06-23 06:15:50 -07:00
msvensson@neptunus.(none)
d36c75aad8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-23 13:10:42 +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
monty@mishka.local
d0700b819e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-06-23 14:04:11 +03:00
timour@mysql.com
b3acc7fe39
Fix for BUG#11185.
...
The source of the problem is in Field_longlong::cmp. If 'this' is
an unsigned number, the method casts both the current value, and
the constant that we compare with to an unsigned number. As a
result if the constant we compare with is a negative number, it
wraps to some unsigned number, and the comparison is incorrect.
When the optimizer chooses the "range" access method, this problem
causes handler::read_range_next to reject the current key when the
upper bound key is a negative number because handler::compare_key
incorrectly considers the positive and negative keys to be equal.
The current patch does not correct the source of the problem in
Field_longlong::cmp because it is not easy to propagate sign
information about the constant at query execution time. Instead
the patch changes the range optimizer so that it never compares
unsiged fields with negative constants. As an added benefit,
queries that do such comparisons will execute faster because
the range optimizer replaces conditions like:
(a) (unsigned_int [< | <=] negative_constant) == FALSE
(b) (unsigned_int [> | >=] negative_constant) == TRUE
with the corresponding constants.
In some cases this may even result in constant time execution.
2005-06-23 12:08:56 +03: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
sergefp@mysql.com
fc75403b4d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10151
2005-06-23 11:03:21 +02:00
timour@mysql.com
3589c51c3b
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-bug-11185
2005-06-23 11:04:40 +03:00
timour@mysql.com
ffd26ba3c7
Merge mysql.com:/home/timka/mysql/src/4.1-dbg
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-06-23 11:01:51 +03:00