Commits · 5edc6449328617e54f55ac2c64857bc074f804c9 · nexedi / MariaDB

11 May, 2006 9 commits

unknown authored May 11, 2006


mysql-test/t/mysqldump.test:
  Removed duplicate test. This is already in the test file.

5edc6449

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · dfd99e36

unknown authored May 11, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

dfd99e36

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ffb9dbcd
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge5
```
ffb9dbcd
Merge mysql.com:/home/psergey/tmp_merge · de284ead
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge5


sql/sql_select.cc:
  Auto merged
```
de284ead
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 87c7bdf6
unknown authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
87c7bdf6

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 82d830a8

unknown authored May 11, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged

82d830a8

Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge · 0f9f8856

unknown authored May 11, 2006

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

0f9f8856

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new · c74d07c1

unknown authored May 11, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge.
sql/sql_show.cc:
  Manual merge.

c74d07c1

Some fixes that were not done in original merge, compilation revealed. · c19aceee

unknown authored May 11, 2006


client/mysqlimport.c:
  Fixed a problem with merge.
include/violite.h:
  Struct name changed, but forgot to change it here.
sql/sql_show.cc:
  Added missing variable.

c19aceee

10 May, 2006 19 commits

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 034c09c0
unknown authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
034c09c0

rpl_log.test: · ca277d58

unknown authored May 11, 2006

  Remove comments not needed


mysql-test/extra/rpl_tests/rpl_log.test:
  Remove comments not needed

ca277d58

rpl_log.test: · 95f6fc9d

unknown authored May 11, 2006

  Correct fix for test bug #19158


mysql-test/extra/rpl_tests/rpl_log.test:
  Correct fix for test bug #19158

95f6fc9d

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · 3f8a3981

unknown authored May 10, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

3f8a3981

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · c3ee901a

unknown authored May 10, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged

c3ee901a

Add missing drop table · 87572bc9
unknown authored May 10, 2006

87572bc9
Update test results for 5.1 · 3a5a54a8
unknown authored May 10, 2006

3a5a54a8
Merge bk-internal:/home/bk/mysql-5.1-new · f92b754f
unknown authored May 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
f92b754f
apparently "sinclude" is consireded by aclocal (up to 1.9.5) · 722d625c
unknown authored May 10, 2006
```
by a dirty word, and it complains about it, even in a comment.
```
722d625c
Merge mysql.com:/M51/unittest-5.1 into mysql.com:/M51/mysql-5.1 · 5ed987e6
unknown authored May 10, 2006

5ed987e6
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 06686f2b
unknown authored May 10, 2006
```
into mysql.com:/M51/mysql-5.1
```
06686f2b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1fb589fb
unknown authored May 10, 2006
```
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
```
1fb589fb

Several "unittest" files : Ensure that the configure result is used when compiling them. · f417c6b2

unknown authored May 10, 2006


unittest/examples/no_plan.t.c:
  Ensure that the "configure" result is used when compiling this module.
unittest/examples/skip_all.t.c:
  Ensure that the configure result is used when compiling this module.
unittest/examples/todo.t.c:
  Ensure that the configure result is used when compiling this module.
unittest/mytap/t/basic.t.c:
  Ensure that the configure result is used when compiling this module.

f417c6b2

a workaround for aclocal-1.8 bug · 821ca744
unknown authored May 10, 2006

821ca744
Update results to 5.1 format · e9a7342e
unknown authored May 10, 2006

e9a7342e

Merge 5.0 to 5.1 · d758c040

unknown authored May 10, 2006


sql/sql_show.cc:
  Add the variable "limited_mysql_mode" to function 'store_create_info'

d758c040

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cc51d5f7
unknown authored May 10, 2006
```
into mysql.com:/M51/mysql-5.1
```
cc51d5f7

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · fc2902d3

unknown authored May 10, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge 5.0 -> 5-1
mysql-test/t/mysqldump.test:
  Manual merge 5.0 -> 5-1

fc2902d3

Merge bk-internal:/home/bk/mysql-5.1-new · 63d341e1
unknown authored May 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
63d341e1

09 May, 2006 12 commits

fix HA_ERR_RECORD_DELETED for falcon · 459a8927
unknown authored May 09, 2006

459a8927

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 · f832eea4

unknown authored May 09, 2006

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  manual merge
include/violite.h:
  Automatic
mysql-test/Makefile.am:
  manual merge
mysql-test/r/mysqldump.result:
  Automatic
mysql-test/r/rpl_user_variables.result:
  Manual merge (diff is because lars removed displaying of binlog)
mysql-test/t/disabled.def:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
mysql-test/t/rpl_user_variables.test:
  manual merge (Changes becasue of lars removed binlog logging)
sql/mysqld.cc:
  manual merge
vio/viossl.c:
  manual merge
vio/viosslfactories.c:
  manual merge
client/client_priv.h.rej:
  merge 5.0 -> 5.1

f832eea4

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 898c8ecf
unknown authored May 09, 2006
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
```
898c8ecf
Merge mysql.com:/home/kgeorge/mysql/5.0/B18068 · b4e093e2
unknown authored May 09, 2006
```
into  mysql.com:/home/kgeorge/mysql/5.1/B18068


sql/sql_select.cc:
  Auto merged
```
b4e093e2
results fixed · 854e1fea
unknown authored May 09, 2006

854e1fea

BUG#18068: SELECT DISTINCT (with duplicates and covering index) · 52ae8e1e

unknown authored May 09, 2006

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.


mysql-test/r/distinct.result:
  test case for the bug without loose index scan
mysql-test/r/group_min_max.result:
  test case for the bug
mysql-test/t/distinct.test:
  test case for the bug without loose index scan
mysql-test/t/group_min_max.test:
  test case for the bug
sql/sql_select.cc:
  duplicates check and removal

52ae8e1e

Merge bk-internal:/home/bk/mysql-5.1-new · ee67140c
unknown authored May 09, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
ee67140c

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 02d4ba94

unknown authored May 09, 2006

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

02d4ba94

Fix InnoDB building on MacOSX when autorun.sh is used · 861bd436
unknown authored May 09, 2006
```
BUILD/autorun.sh:
  Add libtoolize/glibtoolize hook for InnoDB auto-stuff too
```
861bd436
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2076c722
unknown authored May 09, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.0
```
2076c722

Merge mysql.com:/home/marty/MySQL/mysql-4.1 · f2c54984

unknown authored May 09, 2006

into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged

f2c54984

Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH · 5a0af764
unknown authored May 09, 2006

5a0af764