history entries.  Lazy deletion isn't smart or useful here.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Manual merge.  Version bump.

	sql_yacc.yy

Yacc rules lacked semicolons to terminate rules, which is illegal in
old versions of bison.

Added semicolons.


sql/sql_yacc.yy:
  Add semicolons to terminate rules.

into  trift2.:/MySQL/M50/push-5.0

community-exclusive file also referred to struct.


sql/sql_profile.cc:
  Track typedef'd struct.
sql/sql_profile.h:
  Track typedef'd struct.

into  production.mysql.com:/usersnfs/jperkin/bk/bug-27692/5.0

were accidentally removed during a previous rototill of this
code.  Fixes bug#27692.
  
While it can be argued we should strive to provide a 'secure by
default' installation, this happens to be the setup currently
documented in the manual as the default, so defer changes that
improve security out of the box to a co-ordinated effort later
on.
  
For now, make a note about the test databases and anonymous user
in mysql_install_db and recommend that mysql_secure_installation
be ran for users wishing to remove these defaults.

[..re-commit of previously lost change..]


scripts/mysql_system_tables_data.sql:
  Add anonymous accounts.
scripts/mysql_install_db.sh:
  Point users at the mysql_secure_installation script.
mysql-test/mysql-test-run.pl:
  Add a comment where removing anonymous users.

   Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break


ndb/test/ndbapi/testScanFilter.cpp:
   Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break

into  trift2.:/MySQL/M50/push-5.0

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

mysys/mf_tempfile.c:
  Try to avoid passing null as first parameter to GetTempFileName, since it's documented that it won't work.

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

cmake list are auto-generated and thus still required.  Correct fix
not yet known.


bdb/CMakeLists.txt:
  Revert previous change, it is incorrect as those files are automatically
  generated.

added get_field_default_value() function which obtains default value from the field
(used in store_create_info() & get_schema_column_record() functions)


mysql-test/r/alter_table.result:
  result fix
mysql-test/r/create.result:
  result fix
mysql-test/r/ctype_collate.result:
  result fix
mysql-test/r/ctype_recoding.result:
  result fix
mysql-test/r/default.result:
  result fix
mysql-test/r/gis.result:
  result fix
mysql-test/r/grant.result:
  result fix
mysql-test/r/information_schema.result:
  result fix
mysql-test/r/key.result:
  result fix
mysql-test/r/mysql.result:
  result fix
mysql-test/r/ps_1general.result:
  result fix
mysql-test/r/show_check.result:
  result fix
mysql-test/r/sp.result:
  result fix
mysql-test/r/type_enum.result:
  result fix
mysql-test/r/type_ranges.result:
  result fix
mysql-test/t/information_schema.test:
  test case

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

  Post-fix for bug#27695.


mysql-test/t/select.test:
  Post-fix for bug#27695.

into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M41/push-4.1

into  magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.0-opt

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.


mysql-test/r/innodb_mysql.result:
  Bug #31001: test case
mysql-test/t/innodb_mysql.test:
  Bug #31001: test case
sql/sql_select.cc:
  Bug #31001: 
   - account for the case when all the primary key parts are compared
     to a constant
   - force test_if_skip_sort_order to go backwards over the key even 
     when the number of keyparts used is the same as the number of 
     keyparts equal to a constant. (because of the primary key 
     suffix).

into  mysql.com:/home/psergey/mysql-5.0-bug30324

- 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).


mysql-test/r/type_bit.result:
  BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
  - Testcase
mysql-test/t/type_bit.test:
  BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
  - Testcase
sql/item_sum.cc:
  BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
  - Make COUNT(DISTINCT ...) code instruct create_tmp_table to create 
    temporary table with BIGINT, not BIT(N) column.

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt

into  gleb.loc:/home/uchum/work/bk/5.0-opt-27695

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  trift2.:/MySQL/M50/tmp-5.0

Declaring an all space column name in the SELECT FROM DUAL or in a view
leads to misleading warning message:
"Leading spaces are removed from name ' '".

The Item::set_name method has been modified to raise warnings like
"Name ' ' has become ''" in case of the truncation of an all
space identifier to an empty string identifier instead of the
"Leading spaces are removed from name ' '" warning message.


sql/item.cc:
  Fixed bug #27695.
  The Item::set_name method has been modified to raise warnings like
  "Name ' ' has become ''" in case of the truncation of an all
  space identifier to an empty string identifier instead of the
  "Leading spaces are removed from name ' '" warning message.
sql/share/errmsg.txt:
  Fixed bug #27695.
mysql-test/t/select.test:
  Added test case for bug #27695.
mysql-test/r/select.result:
  Added test case for bug #27695.

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  gleb.loc:/home/uchum/work/bk/5.0-opt


sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  SCCS merged
mysql-test/t/sp.test:
  SCCS merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge


mysql-test/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj