Commit graph

47927 commits

Author SHA1 Message Date
istruewing@synthia.local
e091ce28bf Merge synthia.local:/home/mydev/mysql-5.0-axmrg
into  synthia.local:/home/mydev/mysql-5.1-axmrg
2007-06-30 00:46:59 +02:00
istruewing@synthia.local
0fa5fe24a7 Merge synthia.local:/home/mydev/mysql-5.1-amain
into  synthia.local:/home/mydev/mysql-5.1-axmrg
2007-06-30 00:45:24 +02:00
istruewing@synthia.local
b747b6b9d9 Merge synthia.local:/home/mydev/mysql-5.1-ateam
into  synthia.local:/home/mydev/mysql-5.1-axmrg
2007-06-30 00:42:59 +02:00
istruewing@synthia.local
d1d77776c2 Merge synthia.local:/home/mydev/mysql-5.0-amain
into  synthia.local:/home/mydev/mysql-5.0-axmrg
2007-06-29 22:42:36 +02:00
istruewing@synthia.local
f9af4156b5 Merge synthia.local:/home/mydev/mysql-5.0-ateam
into  synthia.local:/home/mydev/mysql-5.0-axmrg
2007-06-29 22:41:07 +02:00
istruewing@synthia.local
baeaeac8b0 Merge mysqldev@production:/data0/mysqldev/my/mysql-5.1-release
into  synthia.local:/home/mydev/mysql-5.1-axmrg
2007-06-29 21:20:39 +02:00
svoj@mysql.com/june.mysql.com
6edc4dccdc BUG#29207 - archive table reported as corrupt by check table
After merge fix.
2007-06-28 14:04:20 +05:00
svoj@june.mysql.com
0cb2099c2d Merge mysql.com:/home/svoj/devel/mysql/BUG29250/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG29250/mysql-5.1-engines
2007-06-28 12:13:57 +05:00
svoj@mysql.com/june.mysql.com
6d4033e624 BUG#29207 - archive table reported as corrupt by check table (P1)
CHECK TABLE against ARCHIVE table may falsely report table corruption,
or cause server crash.

Fixed by using proper buffer for CHECK TABLE.

Affects both 5.0 and 5.1.
2007-06-27 13:19:34 +05:00
tsmith@maint1.mysql.com
2639886711 Bug #29245: Bad Merge Caused Error Codes Conflict between 5.0/5.1
Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
2007-06-26 13:15:43 +02:00
gshchepa/uchum@gleb.loc
39e900e53e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-06-25 18:59:09 +05:00
gshchepa/uchum@gleb.loc
5c7b01dc20 Merge gleb.loc:/home/uchum/work/bk/5.1
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-06-25 18:55:06 +05:00
jbruehe/mysqldev@mysql.com/production.mysql.com
5651ce23d4 Raise version number after cloning 5.1.20-beta 2007-06-25 15:04:31 +02:00
joerg@trift2.
79677b756e Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-06-25 13:22:34 +02:00
svoj@mysql.com/june.mysql.com
c8717280a9 BUG#28026 - Falcon: crash if partitions and select for update
Assertion failure may happen with falcon + partition + select for
update. This may affect other engines as well.

Though assertion failure is fixed with this patch, falcon still
deadlocks when running falcon_bug_28026.test.
2007-06-25 14:42:35 +05:00
holyfoot/hf@hfmain.(none)
0d7168602d Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/27084/my51-27084
2007-06-25 14:28:30 +05:00
gshchepa/uchum@gleb.loc
47d868c919 Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-06-25 14:14:29 +05:00
gshchepa/uchum@gleb.loc
f8b7669ee9 Merge gleb.loc:/home/uchum/work/bk/4.1-opt
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-25 14:13:16 +05:00
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
istruewing@chilla.local
443cf1ae92 Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-24 16:46:17 +02:00
istruewing@chilla.local
9d3c6858af Merge chilla.local:/home/mydev/mysql-5.1-amain
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-24 16:46:16 +02:00
istruewing@chilla.local
d6623f58ca Merge chilla.local:/home/mydev/mysql-5.1-ateam
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-24 16:46:15 +02:00
svoj@april.(none)
af1f24cf21 Merge mysql.com:/home/svoj/devel/mysql/BUG15787/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG15787/mysql-5.1-engines
2007-06-24 19:46:14 +05:00
istruewing@chilla.local
018df17725 Merge chilla.local:/home/mydev/mysql-5.0-amain
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-24 16:44:56 +02:00
istruewing@chilla.local
4bdd8cae08 Merge chilla.local:/home/mydev/mysql-5.0-ateam
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-24 16:44:55 +02:00
svoj@mysql.com/april.(none)
717c8fe98e BUG#15787 - MySQL crashes when archive table exceeds 2GB
Max compressed file size was calculated incorretly causing server
crash on INSERT.

With this patch we use proper max file size provided by zlib.

Affects 5.0 only.
2007-06-24 19:44:54 +05: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
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
svoj@april.(none)
c62450bbb9 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG28971/mysql-5.1-engines
2007-06-22 23:14:59 +05: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
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