Commit graph

33840 commits

Author SHA1 Message Date
unknown
10a0474e9a Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 20:01:35 +02:00
unknown
741c257f48 apparently "sinclude" is consireded by aclocal (up to 1.9.5)
by a dirty word, and it complains about it, even in a comment.
2006-05-10 13:57:58 -04:00
unknown
4adabc64d9 Merge mysql.com:/M51/unittest-5.1 into mysql.com:/M51/mysql-5.1 2006-05-10 18:10:50 +02:00
unknown
4b1d0f9ff6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2006-05-10 18:08:50 +02:00
unknown
80f7d16408 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-10 11:45:40 -04:00
unknown
f543e65564 Several "unittest" files : Ensure that the configure result is used when compiling them.
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.
2006-05-10 17:29:28 +02:00
unknown
bf6524db26 a workaround for aclocal-1.8 bug 2006-05-10 11:27:38 -04:00
unknown
e95a7e88b7 Update results to 5.1 format 2006-05-10 16:58:44 +02:00
unknown
5aab9f40f9 Merge 5.0 to 5.1
sql/sql_show.cc:
  Add the variable "limited_mysql_mode" to function 'store_create_info'
2006-05-10 15:54:51 +02:00
unknown
41aae79fb0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2006-05-10 15:52:45 +02:00
unknown
3d3fb80431 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
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
2006-05-10 15:49:33 +02:00
unknown
368cb39d06 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
unknown
ba71026e03 fix HA_ERR_RECORD_DELETED for falcon 2006-05-09 15:14:29 -04:00
unknown
fb2477b331 Merge mysql.com:/home/kgeorge/mysql/5.0/B18068
into  mysql.com:/home/kgeorge/mysql/5.1/B18068


sql/sql_select.cc:
  Auto merged
2006-05-09 18:47:29 +03:00
unknown
7b111efc23 results fixed 2006-05-09 11:14:31 -04:00
unknown
baae7a97d9 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.


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
2006-05-09 18:13:01 +03:00
unknown
f35496955e 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
unknown
6e50ee2a99 Fix InnoDB building on MacOSX when autorun.sh is used
BUILD/autorun.sh:
  Add libtoolize/glibtoolize hook for InnoDB auto-stuff too
2006-05-09 16:24:57 +03:00
unknown
55f7266bee Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH 2006-05-09 12:06:50 +02:00
unknown
644bd6e2c7 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-05-09 09:44:47 +02:00
unknown
484e89dfb6 typo fixed 2006-05-08 18:14:39 -04:00
unknown
2cd14794ce innodb also need libtoolize 2006-05-08 18:02:05 -04:00
unknown
f3b20f5883 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1


configure.in:
  Auto merged
2006-05-08 23:36:22 +02:00
unknown
2ebba33a9c configure.in : Now that 5.1.10 has been cloned, bump up the version.
configure.in:
  Now that 5.1.10 has been cloned, bump up the version.
2006-05-08 23:34:54 +02:00
unknown
7d318ad975 bootstrap is not using BUILD/autorun.sh :( 2006-05-08 17:10:04 -04:00
unknown
f5babf1f46 autorun.sh:
autotool-ize plugins before the main source tree


BUILD/autorun.sh:
  autotool-ize plugins before the main source tree
2006-05-08 16:50:29 -04:00
unknown
335cf16a52 don't introduce a deprecated syntax 2006-05-08 16:06:16 -04:00
unknown
1211c28a08 merged 2006-05-08 13:41:43 -04:00
unknown
94c6f6dc48 Bug #19572 Memory leaks in cluster when running make test 2006-05-08 18:09:01 +02:00
unknown
2f0b9ce9aa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-08 14:19:32 +02:00
unknown
5b0f172586 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-08 14:15:33 +02:00
unknown
06939d4fe3 removed lead of ndb eventoperations on ndb object delete 2006-05-08 14:11:15 +02:00
unknown
e74a42f50c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
2006-05-08 08:55:50 +02:00
unknown
86383668bb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-05-06 18:41:42 +02:00
unknown
db590c1897 auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files
storage/archive/plug.in:
  MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically
storage/example/plug.in:
  MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically
2006-05-06 07:43:18 -04:00
unknown
11fe300394 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug10405


storage/myisam/mi_check.c:
  Auto merged
2006-05-06 09:49:16 +02:00
unknown
2ad7a70f9e Bug #19492 --binlog-do-db option cuases tables create issues for ndb master
- ndb system tables not created because of filter, moved chack of filter
2006-05-06 01:25:44 +02:00
unknown
8e8d8e8acf Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-05-05 20:09:20 +03:00
unknown
3995b06b40 Don't use row level logging on optimize or repair table.
(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)


mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
  Added extra test + drop of table at end of test
mysql-test/lib/mtr_report.pl:
  Fail if mysqld asserts or prints stack
mysql-test/mysql-test-run.sh:
  Fail if mysqld asserts or prints stack
mysql-test/r/exampledb.result:
  Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/r/innodb.result:
  Extra test to see that we can do an optimize table on an active transaction
mysql-test/r/rpl_failed_optimize.result:
  Added extra test + drop of table at end of test
mysql-test/t/exampledb.test:
  Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/t/innodb.test:
  Extra test to see that we can do an optimize table on an active transaction
sql/handler.cc:
  Don't use row level logging on optimize or repair table.
sql/log.cc:
  Simplify code (no logic changes)
sql/mysql_priv.h:
  Added prototype
sql/sql_base.cc:
  Better name for define
sql/sql_class.cc:
  Indentation fix
sql/sql_parse.cc:
  Make end_active_trans() global
sql/sql_table.cc:
  Ensure we end active transcations if we do an admin command (like optimize, repair etc)
2006-05-05 20:08:40 +03:00
unknown
dac68ff719 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-05 16:54:24 +02:00
unknown
2a6a3ad279 do not install ndb slave if no slaves
fixed memleak in ndbcluster_end


mysql-test/mysql-test-run.pl:
  do not install ndb slave if no slaves
sql/ha_ndbcluster.cc:
  fixed memleak in ndbcluster_end
2006-05-05 15:34:46 +02:00
unknown
4bc3ba7854 Bug #18798: mysqld cores on update in ha_ndbcluster call if cluster has failed before, added extra check that transaction is started 2006-05-05 14:25:57 +02:00
unknown
d1b6779ade Fixed wrong merge 2006-05-05 13:10:42 +03:00
unknown
e44823ff7f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
2006-05-05 11:38:05 +03:00
unknown
286ee9aa22 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-05 09:42:20 +02:00
unknown
9535b1274d After merge fix 2006-05-05 04:52:32 +03:00
unknown
2a655fcc51 ndb: fix compile error 2006-05-05 00:59:27 +02:00
unknown
63851b02a8 ndb: added missing ifdef 2006-05-05 00:33:12 +02:00
unknown
1a9e9cb45a ndb disabled test case against verified bug 2006-05-05 00:06:44 +02:00
unknown
441d501d1b disable test case since it causes failure in ndb_lock occationally, bug report referenced 2006-05-04 23:35:37 +02:00