gkodinov/kgeorge@macbook.local
4eee02dd3d
fixed type conversion warnings revealed by bug 30639
2007-09-21 10:15:16 +02:00
mats@kindahl-laptop.dnsalias.net
8aa3bb0418
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
...
into kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-release
2007-09-20 16:38:36 +02:00
mats@kindahl-laptop.dnsalias.net
c5622b424f
BUG#31076 (Server crashes when start slave is issued):
...
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
2007-09-20 16:31:05 +02:00
gluh@eagle.(none)
7dbcdf9a64
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 16:28:46 +05:00
gluh@mysql.com/eagle.(none)
eef0772b89
result fix
2007-09-20 16:27:58 +05:00
gluh@eagle.(none)
2a02dd13e2
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:40:24 +05:00
gluh@mysql.com/eagle.(none)
4ffcc4f266
result fix
2007-09-20 14:38:41 +05:00
gluh@eagle.(none)
88a4df4ec0
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:10:05 +05:00
gluh@mysql.com/eagle.(none)
6b81174cde
Bug#27747 database metadata doesn't return sufficient column default info
...
added get_field_default_value() function which obtains default value from the field
(used in store_create_info() & get_schema_column_record() functions)
2007-09-20 13:54:46 +05:00
gkodinov/kgeorge@magare.gmz
3dd2ed30ae
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30639-5.1-opt
2007-09-19 18:02:59 +03:00
gkodinov/kgeorge@magare.gmz
c2abf960f9
Bug #30639 : limit offset,rowcount wraps when rowcount >= 2^32 in windows
...
The parser uses ulonglong to store the LIMIT number. This number
then is stored into a variable of type ha_rows. ha_rows is either
4 or 8 byte depending on the BIG_TABLES define from config.h
So an overflow may occur (and LIMIT becomes zero) while storing an
ulonglong value in ha_rows.
Fixed by :
1. Using the maximum possible value for ha_rows on overflow
2. Defining BIG_TABLES for the windows builds (to match the others)
2007-09-19 17:47:52 +03:00
gluh@eagle.(none)
7c87dc6e52
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-19 14:10:01 +05:00
gluh@eagle.(none)
e7a9c4d648
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-19 14:09:23 +05:00
gluh@eagle.(none)
56c927e696
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-09-19 13:50:38 +05:00
gshchepa@devsrv-b.mysql.com
2e26008c3e
Many files:
...
Post-merge fix.
2007-09-15 07:39:58 +02:00
gshchepa@devsrv-b.mysql.com
6234432241
Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-15 07:08:07 +02:00
gshchepa@devsrv-b.mysql.com
0aa6e95768
select.test:
...
Post-fix for bug#27695.
2007-09-15 07:04:32 +02:00
gkodinov/kgeorge@magare.gmz
3b58ae43c8
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.1-opt
2007-09-14 23:48:23 +03:00
gshchepa@devsrv-b.mysql.com
3dc13a6444
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-14 21:17:07 +02:00
gshchepa@devsrv-b.mysql.com
4bf2408ed4
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
2007-09-14 21:15:43 +02:00
joerg@trift2.
f724efee59
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-09-14 19:52:07 +02:00
joerg@trift2.
0cdf470a2e
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-09-14 19:47:38 +02:00
joerg@trift2.
8fd3d71109
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-09-14 19:29:26 +02:00
joerg@trift2.
100f69154d
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-09-14 19:23:05 +02:00
joerg@trift2.
e78513165c
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-09-14 19:21:02 +02:00
sergefp@mysql.com
df1eb8ac5d
Fix compile failure on windows
2007-09-14 21:15:57 +04:00
gkodinov/kgeorge@magare.gmz
0133bc639c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.0-opt
2007-09-14 19:04:47 +03:00
gkodinov/kgeorge@magare.gmz
6927e67dd9
Merge magare.gmz:/home/kgeorge/mysql/work/B31001-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B31001-5.1-opt
2007-09-14 19:03:14 +03:00
gshchepa@devsrv-b.mysql.com
ca15f7b190
Many files:
...
Merge with 5.0-opt.
2007-09-14 17:21:50 +02:00
gkodinov/kgeorge@magare.gmz
dc02820236
Bug #31001 : ORDER BY DESC in InnoDB not working
...
The optimizer sets index traversal in reverse order only if there are
used key parts that are not compared to a constant.
However using the primary key as an ORDER BY suffix rendered the check
incomplete : going in reverse order must still be used even if
all the parts of the secondary key are compared to a constant.
Fixed by relaxing the check and set reverse traversal even when all
the secondary index keyparts are compared to a const.
Also account for the case when all the primary keys are compared to a
constant.
2007-09-14 18:20:17 +03:00
gkodinov/kgeorge@magare.gmz
a2afc56f61
Bug #31001 : ORDER BY DESC in InnoDB not working
...
The optimizer sets index traversal in reverse order only if there are
used key parts that are not compared to a constant.
However using the primary key as an ORDER BY suffix rendered the check
incomplete : going in reverse order must still be used even if
all the parts of the secondary key are compared to a constant.
Fixed by relaxing the check and set reverse traversal even when all
the secondary index keyparts are compared to a const.
Also account for the case when all the primary keys are compared to a
constant.
2007-09-14 17:43:14 +03:00
sergefp@pylon.mylan
c54ce038cb
Merge mysql.com:/home/psergey/mysql-5.0-bug30324
...
into mysql.com:/home/psergey/mysql-5.1-bug27927
2007-09-14 15:05:20 +04:00
sergefp@pylon.mylan
15b7d5e8af
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug30324
2007-09-14 15:00:10 +04:00
sergefp@mysql.com
8a3e6201b3
BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
...
- The bug was caused by COUNT(DISTINCT ...) code using Unique object in
a way that assumed that BIT(N) column occupies a contiguous space in
temp_table->record[0] buffer.
- The fix is to make COUNT(DISTINCT ...) code instruct create_tmp_table to
create temporary table with column of type BIGINT, not BIT(N).
2007-09-14 14:53:13 +04:00
sergefp@pylon.mylan
003bb7b994
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/psergey/mysql-5.1-bug27927
2007-09-14 14:25:45 +04:00
sergefp@mysql.com
41404ec52e
BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions
...
- Introduced val_int_endpoint() function which converts between func
argument intervals and func value intervals for monotonic functions.
- Made partition interval analyzer use part_expr->val_int_endpoint()
to check if the edge values should be included.
2007-09-14 14:18:42 +04:00
tomas@whalegate.ndb.mysql.com
0f36ce8f86
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-14 11:13:00 +02:00
tomas@whalegate.ndb.mysql.com
758999357f
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-14 11:11:05 +02:00
tomas@whalegate.ndb.mysql.com
7cf77f49d3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-14 11:08:55 +02:00
tomas@whalegate.ndb.mysql.com
965124b4a5
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-14 11:05:38 +02:00
tomas@whalegate.ndb.mysql.com
54adc4ee80
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-14 11:04:24 +02:00
gshchepa@devsrv-b.mysql.com
a9987ffde4
Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-14 10:37:42 +02:00
gshchepa@devsrv-b.mysql.com
e6e56ccc01
Merge devsrv-b.mysql.com:/users/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
2007-09-14 10:11:51 +02:00
gshchepa/uchum@gleb.loc
72e36e0aa3
Merge gshchepa@bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt-27695
2007-09-14 13:11:50 +05:00
gshchepa/uchum@gleb.loc
0b7e4b4dde
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-14 12:35:06 +05:00
gshchepa/uchum@gleb.loc
aac756e4ff
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-14 12:18:48 +05:00
gshchepa/uchum@gleb.loc
7284a865df
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-14 12:16:19 +05:00
joerg@trift2.
c66df1c169
scripts/mysqld_safe.sh
...
Copy a fix by jperkin for bug#30624 into the 5.1.22 build tree.
2007-09-14 00:59:22 +02:00
joerg@trift2.
b0fb8aa374
Merge trift2.:/MySQL/M50/tmp-5.0
...
into trift2.:/MySQL/M51/tmp-5.1
2007-09-13 23:56:48 +02:00
joerg@trift2.
6a67761bcc
Merge trift2.:/MySQL/M51/push-5.1
...
into trift2.:/MySQL/M51/tmp-5.1
2007-09-13 23:54:22 +02:00