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
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
reggie@mdk10.(none)
98ddf74dd3
Merge mdk10.(none):/home/reggie/bk/bug9148
...
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
2005-06-22 18:51:48 -05:00
evgen@moonbone.local
4ddc13af42
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-merge
2005-06-23 03:51:47 +04: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
patg@radha.local
7f5d7d47b3
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Volumes/disk2s1/mysql-5.0
2005-06-22 21:23:33 +02:00
konstantin@mysql.com
6a0adade83
Remove THD::stmt_backup
2005-06-22 23:12:25 +04: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)
732185c547
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-22 20:50:52 +02:00
msvensson@neptunus.(none)
5dfa2a014a
Merge fixes
2005-06-22 20:49:58 +02:00
msvensson@neptunus.(none)
2e232feb7d
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050622184432|37770
2005-06-22 20:45:20 +02:00
msvensson@neptunus.(none)
2d0b93f955
Will do cset -x on this.
2005-06-22 20:44:32 +02:00
msvensson@neptunus.(none)
8018f99ce7
Merging
2005-06-22 20:43:10 +02: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)
8e9c7a42df
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-22 20:24:10 +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
msvensson@neptunus.(none)
1199b4ec9d
Fix mysqldump for so that my_programname is set to "mysqldump".
...
Correct test results now when error message output is predictable.
2005-06-22 20:12:21 +02:00
patg@radha.local
144045ffae
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Volumes/disk2s1/mysql-5.0
2005-06-22 19:40:46 +02:00
patg@radha.local
172dab875b
Bug# 9926, This is the same as changeset 1.1934, which was approved by Monty
2005-06-22 19:29:34 +02:00
heikki@hundin.mysql.fi
5aa75ce741
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-22 20:07:34 +03:00
kent@mysql.com
0c72aa5ef2
mtr_cases.pl:
...
Add a slave when running the federated test case
2005-06-22 19:07:34 +02:00
elliot@mysql.com
bafab2dd6f
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:33 -04:00
elliot@mysql.com
0f92a2cfd6
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:32 -04:00
heikki@hundin.mysql.fi
2358cb0895
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-22 20:07:31 +03:00
kent@mysql.com
35c939d3c4
mysql-test-run.pl:
...
Bug#11481, set charset directory to mysqlbinlog
2005-06-22 19:07:31 +02: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
kent@mysql.com
c4fe91b7da
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-22 19:07:30 +02: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
lars@mysql.com
008548150c
BUG#9361: Added test cases
2005-06-22 17:12:02 +02:00
msvensson@neptunus.(none)
9258513c1e
Bug #9558 mysqldump --no-data db t1 t2 format still dumps data
...
- Check the Dflag variable inside of function dump_table to see if data should be
dumped or not.
- Add test for --xml and --no-data as well
Reapplying patch!
2005-06-22 15:43:49 +02:00
msvensson@neptunus.(none)
fd82fd86bc
Merge to 5.0
2005-06-22 15:32:05 +02:00
msvensson@neptunus.(none)
e9e048f321
Merge fix
2005-06-22 15:29:08 +02:00
svoj@mysql.com
1b59ffb8a8
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0
2005-06-22 17:17:40 +05:00
msvensson@neptunus.(none)
94e37bc3fc
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050622121209|37729
2005-06-22 14:16:26 +02:00
msvensson@neptunus.(none)
777e1d785c
Should not be changed
2005-06-22 14:12:09 +02:00
msvensson@neptunus.(none)
85b9ffc4ca
Merged from mysql-4.1 to mysql-5.0
2005-06-22 14:10:02 +02:00
svoj@mysql.com
c275bde204
Better AR guessing.
2005-06-22 16:29:21 +05: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