ramil@mysql.com
66330a9d59
an improvement (bug #7851 : C++ 'new' conflicts with kernel header asm/system.h).
2005-06-24 12:51:11 +05: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
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
009e2457d9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10151
2005-06-23 19:06:34 +02:00
evgen@moonbone.local
be76efab84
sql_parse.cc:
...
Fix for fix for bug #9728
Error caused server hang on prepared insert ... select
2005-06-23 21:06:33 +04: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
sergefp@mysql.com
1e7cfe1e21
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10151
2005-06-23 17:12:04 +02: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)
62d14e4d06
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-23 13:53:59 +02: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
9dca446d60
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-06-23 13:33:20 +03:00
lenz@mysql.com
a5e8bce119
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-06-23 12:03:10 +02:00
lenz@mysql.com
cacb7199d3
- manual merge of the new node names
2005-06-23 11:34:58 +02:00
lenz@mysql.com
03b128971e
- fixed text file generation - the node names in the info page had changed
2005-06-23 11:30:40 +02: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
294498e203
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 10:56:44 +03:00
msvensson@neptunus.(none)
e929e55fb6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-22 20:59:34 +02:00
lars@mysql.com
53761ce08f
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1
2005-06-22 20:59:33 +02:00
reggie@mdk10.(none)
705992719a
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/bug9148
2005-06-22 13:59:32 -05:00
sergefp@mysql.com
3196513258
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10151
2005-06-22 20:59:32 +02:00
evgen@moonbone.local
54d3b00184
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/mysql-4.1-bug-8147
2005-06-22 22:59:31 +04:00
evgen@moonbone.local
6b9df50c5e
item.h:
...
Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
Have to return false to set flag for whole expression.
2005-06-22 22:58:44 +04:00
msvensson@neptunus.(none)
01b025c2d2
Fix so that my_progname is set to "mysqldump"
2005-06-22 20:37:14 +02:00
msvensson@neptunus.(none)
2dd6a58d58
BUG#9657 mysqldump xml ( -x ) does not format NULL fields correctly
...
- Importing the bug fixes by patch due to merge problems.
2005-06-22 20:22:54 +02:00
lars@mysql.com
008548150c
BUG#9361: Added test cases
2005-06-22 17:12:02 +02:00
msvensson@neptunus.(none)
61a3e16bfd
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug10589
2005-06-22 12:41:33 +02:00
lenz@mysql.com
819fc8dd1f
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-06-22 12:38:38 +02:00
mskold@mysql.com
18804df51e
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-22 11:51:18 +02:00
mskold@mysql.com
c8398bcd2b
Made upgrade compatibility in 4.1 range to latest build version
2005-06-22 11:18:40 +02:00
petr@mysql.com
dff36b3e4e
fix README file to be more verbose match actual situation (recomitted to push into 4.1)
2005-06-22 05:18:43 +02: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
elliot@mysql.com
a24336cdcb
BUG#10442 Minor changes from code review
2005-06-21 15:40:58 -04:00
reggie@mdk10.(none)
93b38c5f67
Bug #9148 Denial of Service
...
my_access.c:
Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names
2005-06-21 13:35:12 -05: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
jimw@mysql.com
d11ef13ad9
Restore creation of files for temporary tables in the tmpdir,
...
which was broken by an earlier bug fix. (Bug #11440 )
2005-06-21 11:25:51 -07:00
kent@mysql.com
26dc9492c3
mysql-test-run.pl:
...
Added optional paths for finding mysqld on Windows
Added language/charset options to embedded mysql_client_test
2005-06-21 20:25:50 +02: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
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
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