Commit graph

47952 commits

Author SHA1 Message Date
gshchepa/uchum@gleb.loc
4e139ed375 Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-25 14:12:01 +05:00
gshchepa/uchum@gleb.loc
9e521d1d04 Merge gleb.loc:/home/uchum/work/bk/5.1
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-06-25 14:10:12 +05:00
gshchepa/uchum@gleb.loc
78e900dd92 Merge gleb.loc:/home/uchum/work/bk/4.1
into  gleb.loc:/home/uchum/work/bk/4.1-opt
2007-06-25 14:08:53 +05:00
igor@olga.mysql.com
31bd1715db Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.1-opt
2007-06-24 19:06:09 -07:00
gshchepa/uchum@gleb.loc
0278fa447c rpl_skip_error.result:
Merge with 5.1.
2007-06-25 05:35:45 +05:00
gshchepa/uchum@gleb.loc
a1ebc8590c Merge gleb.loc:/home/uchum/work/bk/5.1
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-06-25 03:40:30 +05:00
igor@olga.mysql.com
da41606087 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25602
2007-06-24 10:50:24 -07:00
gshchepa/uchum@gleb.loc
684d0ced77 Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-24 12:58:45 +05:00
igor@olga.mysql.com
59b9077ce4 Fixed bug #25602. A query with DISTINCT in the select list to which
the loose scan optimization for grouping queries was applied returned 
a wrong result set when the query was used with the SQL_BIG_RESULT
option.

The SQL_BIG_RESULT option forces to use sorting algorithm for grouping
queries instead of employing a suitable index. The current loose scan
optimization is applied only for one table queries when the suitable
index is covering. It does not make sense to use sort algorithm in this
case. However the create_sort_index function does not take into account
the possible choice of the loose scan to implement the DISTINCT operator
which makes sorting unnecessary. Moreover the current implementation of
the loose scan for queries with distinct assumes that sorting will
never happen. Thus in this case create_sort_index should not call
the function filesort.
2007-06-23 23:33:55 -07:00
gshchepa/uchum@gleb.loc
9866b45f3b Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-06-24 03:44:50 +05:00
gshchepa/uchum@gleb.loc
7cdef518b2 Merge gleb.loc:/home/uchum/work/bk/4.1-opt
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-24 03:42:18 +05:00
gshchepa/uchum@gleb.loc
2cd4abebfb Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-06-24 03:35:27 +05:00
gshchepa/uchum@gleb.loc
e5798d0466 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29095
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-24 01:22:25 +05:00
gshchepa/uchum@gleb.loc
fbbb30a622 Fixed bug #29095.
INSERT into table from SELECT from the same table
with ORDER BY and LIMIT was inserting other data
than sole SELECT ... ORDER BY ... LIMIT returns.

One part of the patch for bug #9676 improperly pushed
LIMIT to temporary table in the presence of the ORDER BY
clause.
That part has been removed.
2007-06-24 01:20:14 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
0204113813 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b29079/b29079.5.1
2007-06-23 09:23:18 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
fabcc6f41e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b29079/b29079.5.0
2007-06-23 09:23:09 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
20fd3933ce Merge mysql.com:/home/ram/work/b29079/b29079.5.0
into  mysql.com:/home/ram/work/b29079/b29079.5.1
2007-06-23 09:03:03 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d82d6c08fd Merge mysql.com:/home/ram/work/b29079/b29079.4.1
into  mysql.com:/home/ram/work/b29079/b29079.5.0
2007-06-23 08:56:53 +05:00
joerg@trift2.
a8d5779448 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-06-22 23:02:41 +02:00
joerg@trift2.
ce04d39de9 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-06-22 22:54:02 +02:00
joerg@trift2.
41bc28aecd Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-06-22 22:48:17 +02:00
joerg@trift2.
3d0064d6a5 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-06-22 22:32:50 +02:00
tsmith@maint1.mysql.com
65ce26a619 Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-22 20:11:12 +02:00
joerg@trift2.
4e9d181fad Add the "nist" suite to the "test-bt" target,
to be run only if it is available on the machine.
2007-06-22 20:08:19 +02:00
gkodinov/kgeorge@magare.gmz
6a6f723428 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28400-5.0-opt
2007-06-22 15:35:59 +03:00
gkodinov/kgeorge@magare.gmz
f45601ce58 Bug #27383: Crash in test "mysql_client_test"
The C optimizer may decide that data access operations
through pointer of different type are not related to 
the original data (strict aliasing).
This is what happens in fetch_long_with_conversion(),
when called as part of mysql_stmt_fetch() : it tries 
to check for truncation errors by first storing float
(and other types of data) into a char * buffer and then 
accesses them through a float pointer.
This is done to prevent the effects of excess precision
when using FPU registers.
However the doublestore() macro converts a double pointer
to an union pointer. This violates the strict aliasing rule.
Fixed by making the intermediary variables volatile (
to not re-introduce the excess precision bug) and using
the intermediary value instead of the char * buffer.
Note that there can be loss of precision for both signed
and unsigned 64 bit integers converted to double and back,
so the check must stay there (even for compatibility 
reasons).
Based on the excellent analysis in bug 28400.
2007-06-22 15:34:28 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
aabbd2fb69 Fix for bug #29079: Semantics of "bigint" depend on platform specifics (size, signedness of char ?)
Problem: long and long long types mess in a comparison may lead to wrong results on some platforms.
Fix: prefer [unsigned] long long as [u]longlong as it's used unconditionally in many places.
2007-06-22 17:12:40 +05:00
joerg@trift2.
1d18f3e4aa Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-06-22 14:03:50 +02:00
joerg@trift2.
bdd95f681a Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-06-22 13:19:14 +02:00
joerg@trift2.
7766c0d4d9 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-06-22 13:13:32 +02:00
tsmith@maint1.mysql.com
764a7a911c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-22 11:30:17 +02:00
tsmith@maint1.mysql.com
9f23427499 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-22 11:23:12 +02:00
tsmith@maint1.mysql.com
5b13cc5a30 binlog_innodb.result:
post-merge fix
2007-06-22 11:22:29 +02:00
holyfoot/hf@hfmain.(none)
287f3485af Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/28839/my50-28839
2007-06-22 10:12:15 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
38991f3e80 merging fix 2007-06-22 09:59:23 +05:00
holyfoot/hf@hfmain.(none)
faa251305c Merge mysql.com:/home/hf/work/28839/my50-28839
into  mysql.com:/home/hf/work/28839/my51-28839
2007-06-22 09:33:03 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
78c53ea32e rpl_skip_error.test fixed 2007-06-22 09:28:38 +05:00
dkatz@damien-katzs-computer.local
0d84133a4c Merge damien-katzs-computer.local:/Users/dkatz/50_kill
into  damien-katzs-computer.local:/Users/dkatz/mysql51
2007-06-21 22:08:14 -04:00
dkatz@damien-katzs-computer.local
a393b215fb Bug #29138 'kill' fails in pushbuild
The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.

Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.
2007-06-21 21:39:52 -04:00
tsmith@maint1.mysql.com
8a946f5596 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-22 01:43:57 +02:00
igor@olga.mysql.com
802dcc7a45 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29104
2007-06-21 15:25:23 -07:00
tsmith@maint1.mysql.com
28242f775c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-21 22:10:40 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
5847f02846 Disabled new test cases that are not 100% stable yet 2007-06-21 22:07:21 +02:00
tsmith@maint1.mysql.com
8ee2c2b04e Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-21 20:55:37 +02:00
tsmith@maint1.mysql.com
1349671c5f Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-21 20:12:35 +02:00
tsmith@maint1.mysql.com
b8881ebfd4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-21 20:09:04 +02:00
tsmith@maint1.mysql.com
2c0b7d0428 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-rpl
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
2007-06-21 19:48:05 +02:00
tsmith@maint1.mysql.com
3ae37d30de Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-21 18:58:31 +02:00
iggy@amd64.(none)
08cb616544 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  amd64.(none):/src/bug27029/my51-bug27029
2007-06-21 12:53:03 -04:00
iggy@amd64.(none)
1378e94aa0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  amd64.(none):/src/bug27029/my50-bug27029
2007-06-21 12:52:20 -04:00