brian@zim.(none)
a93be9f957
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-13 11:40:27 -07:00
sergefp@mysql.com
a70bfd6c69
Merge mysql.com:/home/psergey/tmp_merge3
...
into mysql.com:/home/psergey/mysql-5.1-merge2
2006-05-13 22:40:26 +04:00
acurtis@xiphis.org
ff71980af7
fix binlog results
2006-05-13 01:09:00 -07:00
acurtis@xiphis.org
a84822afde
fix partition test
2006-05-12 22:30:13 -07:00
acurtis@xiphis.org
4e2c63a7ba
Merge bk-internal:/home/bk/mysql-5.1-new
...
into xiphis.org:/home/acurtis/mysql-5.1-merge
2006-05-12 17:40:58 -07:00
ngrishakin@mysql.com
5caf8bc77b
Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
2006-05-13 01:32:24 +02:00
ngrishakin@mysql.com
e4497ace5f
.del-ndb_partition_range.result~17fc1db754d4153d:
...
Delete: mysql-test/r/ndb_partition_range.result
.del-ndb_partition_list.result~7af68cd45e74abf:
Delete: mysql-test/r/ndb_partition_list.result
.del-ndb_partition_key.result~68b9a59cff8c9840:
Delete: mysql-test/r/ndb_partition_key.result
.del-ndb_partition_error.result~944f84894e323e9:
Delete: mysql-test/r/ndb_partition_error.result
.del-ndb_blob_partition.result~fda88ddfc5477a7e:
Delete: mysql-test/r/ndb_blob_partition.result
.del-ndb_partition_range.test~af8f9016b6648239:
Delete: mysql-test/t/ndb_partition_range.test
.del-ndb_partition_list.test~940289b3d58595ca:
Delete: mysql-test/t/ndb_partition_list.test
.del-ndb_partition_key.test~ed7b15c91f66558d:
Delete: mysql-test/t/ndb_partition_key.test
.del-ndb_partition_error.test~2da477be29be041f:
Delete: mysql-test/t/ndb_partition_error.test
.del-ndb_blob_partition.test~ea99ef9759705ce3:
Delete: mysql-test/t/ndb_blob_partition.test
2006-05-13 01:30:44 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ab63f5d072
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 15:47:20 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
640a4de065
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 15:44:15 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cb28572558
merge
2006-05-12 15:41:46 -04:00
acurtis@xiphis.org
1b8af703a3
fix results after merge
2006-05-12 11:49:35 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c85be97f50
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:22:31 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c558d9d00d
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:14:39 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14bbe2c0ee
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:11:46 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
113cc95f84
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:09:26 -04:00
acurtis@xiphis.org
9ba0ac9579
manual merge bug#10952
2006-05-12 08:50:31 -07:00
jmiller@mysql.com
e9056d856d
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-12 14:28:16 +02:00
msvensson@neptunus.(none)
47a578f4e4
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 08:45:22 +02:00
brian@zim.(none)
b283a96933
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-11 12:51:31 -07:00
jmiller@mysql.com
11d442a1c3
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-11 21:46:10 +02:00
sergefp@mysql.com
acdc038a44
Bug#19136: Manual 5.0->5.1 merge
2006-05-11 20:41:11 +04:00
jmiller@mysql.com
f1d1c98df6
changes for when NDB is default engine
2006-05-11 18:12:06 +02:00
sergefp@mysql.com
22c71d3db8
Merge mysql.com:/home/psergey/tmp_merge
...
into mysql.com:/home/psergey/mysql-5.1-merge5
2006-05-11 18:41:53 +04:00
kroki@mysql.com
0499b30151
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-05-11 11:28:56 +04:00
brian@zim.(none)
d1c9c2c5b2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-10 14:14:51 -07:00
msvensson@neptunus.(none)
14a6cacec4
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 21:44:11 +02:00
msvensson@neptunus.(none)
41f1206b62
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 21:38:48 +02:00
msvensson@neptunus.(none)
3b9891716c
Add missing drop table
2006-05-10 21:35:05 +02:00
msvensson@neptunus.(none)
6420483d6b
Update test results for 5.1
2006-05-10 20:39:26 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
56b97747de
BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table.
2006-05-10 12:53:40 -04:00
msvensson@neptunus.(none)
efea82bfba
Update results to 5.1 format
2006-05-10 16:58:44 +02:00
msvensson@neptunus.(none)
4736d8d53c
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 15:49:33 +02:00
sergefp@mysql.com
2956dbe84f
BUG#17379 Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
...
Re-work best_access_path() and find_best() to reuse E(#rows(range access)) as
E(#rows(ref[_or_null](const) access) only when it is appropriate.
[This is the final cumulative patch]
2006-05-10 17:40:20 +04:00
msvensson@neptunus.(none)
f5cbfceb93
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 09:21:58 +02:00
gkodinov@mysql.com
1efda1ea54
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18068
2006-05-10 09:38:40 +03:00
acurtis@xiphis.org
22b6b4cbd6
Merge xiphis.org:/home/antony/work2/p1-bug10952.1
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
2006-05-09 15:12:32 -07:00
acurtis@xiphis.org
7c9b4c2792
Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/p1-bug10952.1
2006-05-09 13:34:31 -07:00
acurtis@xiphis.org
47e89f208a
bug#10952
...
"alter table from MyISAM to MERGE lost data without errors and warnings"
Add new handlerton flag which prevent user from altering table storage
engine to storage engines which would lose data. Both 'blackhole' and
'merge' are marked with the new flag.
Tests included.
2006-05-09 13:31:46 -07:00
brian@zim.(none)
b00c0f6694
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-09 10:21:55 -07:00
gkodinov@mysql.com
baba405cfa
Merge mysql.com:/home/kgeorge/mysql/5.0/B18068
...
into mysql.com:/home/kgeorge/mysql/5.1/B18068
2006-05-09 18:47:29 +03:00
serg@sergbook.mysql.com
c4f3410449
results fixed
2006-05-09 11:14:31 -04:00
gkodinov@mysql.com
7bae0de398
BUG#18068: SELECT DISTINCT (with duplicates and covering index)
...
When converting DISTINCT to GROUP BY where the columns are from the covering
index and they are quoted twice in the SELECT list the optimizer is creating
improper processing sequence. This is because of the fact that the columns
of the covering index are not recognized as such and treated as non-index
columns.
Generally speaking duplicate columns can safely be removed from the GROUP
BY/DISTINCT list because this will not add or remove new rows in the
resulting set. Duplicates can be removed even if they are not consecutive
(as is the case for ORDER BY, where the duplicate columns can be removed
only if they are consecutive).
So we can safely transform "SELECT DISTINCT a,a FROM ... ORDER BY a" to
"SELECT a,a FROM ... GROUP BY a ORDER BY a" instead of
"SELECT a,a FROM .. GROUP BY a,a ORDER BY a". We can even transform
"SELECT DISTINCT a,b,a FROM ... ORDER BY a,b" to
"SELECT a,b,a FROM ... GROUP BY a,b ORDER BY a,b".
The fix to this bug consists of checking for duplicate columns in the SELECT
list when constructing the GROUP BY list in transforming DISTINCT to GROUP
BY and skipping the ones that are already in.
2006-05-09 18:13:01 +03:00
msvensson@neptunus.(none)
c422ffc404
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-09 16:38:49 +02:00
mskold@mysql.com
9bde189d55
Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH
2006-05-09 12:06:50 +02:00
msvensson@neptunus.(none)
2759603c1d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-09 10:44:19 +02:00
msvensson@neptunus.(none)
af47f9092c
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-09 09:44:47 +02:00
msvensson@neptunus.(none)
27c64c715f
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-09 08:26:25 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
b8227de1bf
BUG#19140: Create index caused crash
2006-05-08 21:41:10 -04:00
brian@zim.(none)
aed151cf40
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-08 15:34:55 -07:00
serg@sergbook.mysql.com
976f1da21f
don't introduce a deprecated syntax
2006-05-08 16:06:16 -04:00