into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
mysql-test/r/ps_1general.result:
  merge ("ul", will fix)
sql/examples/ha_tina.cc:
  merge
sql/ha_innodb.cc:
  merge
sql/handler.h:
  merge
sql/log.cc:
  merge
sql/set_var.cc:
  merge
sql/share/errmsg.txt:
  merge (bad, will fix)
sql/sql_show.cc:
  merge (bad, will fix)
sql/sql_yacc.yy:
  merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  merge

into  mysql.com:/home/mysql_src/mysql-5.1

The code was reading a HASH or DYNAMIC_ARRAY which may be uninited (difference from 5.0
is that those vars were always zeroed in 5.0 because were static globals, while they are new'd in 5.1).


sql/rpl_filter.cc:
  the hash or dynamic_array may not be inited, depends on a bool (e.g. if wild_do_table_inited==0
  wild_do_table is uninitialized memory); the code was not taking the bool into account and so reading uninited memory.
sql/rpl_filter.h:
  comments and prototype change (see rpl_filter.cc)

into lmy004.:/work/mysql-5.1-bdb_region


sql/mysqld.cc:
  Auto merged

sql/mysqld.cc:
  reorder
sql/set_var.cc:
  reorder

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/ha_berkeley.cc:
  Auto merged

into lmy004.:/work/mysql-5.1-bdb_region

into  selena.:H:/MYSQL/src/#14569-mysql-5.0


sql/sql_parse.cc:
  Auto merged

into  selena.:H:/MYSQL/bkt/mysql-5.0

my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to 
allow deleting opened files. my_sopen() implementation is added to
support this functionality.


include/my_global.h:
  Fixes bug #13377. Added number of constants for share delete file
  open option.
include/my_sys.h:
  Fixes bug #13377. Added my_sopen function.
mysys/my_create.c:
  Fixes bug #13377. my_create() function changed to use my_sopen() and which allows
  to use FILE_SHARE_DELETE flag on win32, which helps in deleting opened files.
mysys/my_open.c:
  Fixes bug #13377. my_open() function changed to use my_sopen() on win32
  which allows to use FILE_SHARE_DELETE flag to allow deleting opened files.
sql/log.cc:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.
sql/sql_class.h:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.
sql/sql_repl.cc:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.

VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.
sql/ha_innodb.cc:
  Fixed compiler error for Win32 build.
sql/spatial.cc:
  Fixed compiler error for Win32 build. float8get should be enclosed
  in {} since it is macro on win32 and might cause unmatching blocks.

storage/ndb/src/kernel/vm/testSuperPool.cpp:
  test LinearPool

  Disabled yaSSL support for now


include/config-win.h:
  Disabled yaSSL support for now

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/mysql-test-run.pl:
  Auto merged

  Corrected search for 'mysqlimport' executable


mysql-test/mysql-test-run.pl:
  Corrected search for 'mysqlimport' executable

- added bdb-cache-parts
- modified bdb-cache-size to support more than 4G
- added bdb-region-size (size of memory pool for storing file names used in transaction)


sql/ha_berkeley.cc:
  - added bdb-cache-parts
  - modified bdb-cache-size to support more than 4G
  - added bdb-region-size (size of memory pool for storing file names used in transaction)
sql/ha_berkeley.h:
  - added bdb-cache-parts
  - modified bdb-cache-size to support more than 4G
  - added bdb-region-size (size of memory pool for storing file names used in transaction)
sql/mysqld.cc:
  - added bdb-cache-parts
  - modified bdb-cache-size to support more than 4G
  - added bdb-region-size (size of memory pool for storing file names used in transaction)
sql/set_var.cc:
  - added bdb-cache-parts
  - modified bdb-cache-size to support more than 4G
  - added bdb-region-size (size of memory pool for storing file names used in transaction)

sql/ha_berkeley.cc:
  Add full list of BDB lock detection types.

support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully stytic, "build")
  and the one already installed onm the system for the "max" build which is also labeled "experimental".

be the same as the suggested innodb_buffer_pool_size.


support-files/my-large.cnf.sh:
  Increase bdb_cache_size
support-files/my-medium.cnf.sh:
  Increase bdb_cache_size

we changing current db temporarily and restore it when sp is created. however thd->db
in this case becomes empty string rather than NULL and so all checks of thd->db == NULL 
will be false. So if after this we'll issue create procedure sp2()... without specifying
db it will succeed and create sp with db=NULL, which causes mysqldto crash on 
show procedure status statement.

This patch fixes the problem.


mysql-test/r/sp-error.result:
  Result for bug #14569.
mysql-test/t/sp-error.test:
  Test for bug #14569.
sql/sql_db.cc:
  Fixes bug #14569. When no db is selected as current and we do create procedure db.sp()...
  we changing current db temporarily and restore it when sp is created. however thd->db
  in this case becomes empty string rather than NULL and so all checks of thd->db == NULL 
  will be false. This patch fixes this issue.
sql/sql_parse.cc:
  Fixes bug #14569. Reverted from initial patch to check thd->db for null values only.

it is added a check of not being empty value. When modifying SP with Admin 
application on win32 it does not pass curent database so sp is stored with
db=null which causes a crash later on show procedure status;

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.1


BitKeeper/deleted/.del-compile-sap-debug~d5408f42e7872e6e:
  Auto merged
BitKeeper/deleted/.del-compile-sap~a5a15ffc19b27505:
  Auto merged

BitKeeper/deleted/.del-compile-sap~a5a15ffc19b27505:
  Delete: BUILD/compile-sap
BitKeeper/deleted/.del-compile-sap-debug~d5408f42e7872e6e:
  Delete: BUILD/compile-sap-debug

into  mysql.com:/home/timka/mysql/src/5.0-bug-14662

BitKeeper/deleted/.del-compile-sap-debug~d5408f42e7872e6e:
  Delete: BUILD/compile-sap-debug
BitKeeper/deleted/.del-compile-sap~a5a15ffc19b27505:
  Delete: BUILD/compile-sap

into  mysql.com:/home/timka/mysql/src/5.0-bug-14662

the same column as an aliased and as a non-aliased column.

The problem was that Item_direct_view_ref::eq() was first comparing view columns
by name, and in this case the name of one of them is different since it is aliased.


mysql-test/r/select.result:
  Added test for BUG#14662.
mysql-test/t/select.test:
  Added test for BUG#14662.
sql/item.cc:
  Changed the way view column refenreces are compared. Two view columns are
  equal if they resolve to the same result field of a view.

                  for invalid view
 Permit SHOW CREATE VIEW, SHOW CREATE TABLE, and retrieval of metadata from
 information_schema for invalid views


mysql-test/r/information_schema.result:
  Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail 
                    for invalid view
   test case
mysql-test/t/information_schema.test:
  Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail 
                    for invalid view
   test case

into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818


sql/sql_show.cc:
  Auto merged

into  zim.(none):/home/brian/mysql/show-5.1-new


sql/sql_show.cc:
  Auto merged

sql/sql_show.cc:
  Added new fields to show engines.

into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818

into  zim.(none):/home/brian/mysql/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0

into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818


mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  Manual merge.

checks on trigger activation)


mysql-test/r/information_schema.result:
  Update result file: a new column DEFINER has been added to
  INFORMATION_SCHEMA.TRIGGERS.
mysql-test/r/mysqldump.result:
  Update result file: a new column DEFINER has been added to
  INFORMATION_SCHEMA.TRIGGERS.
mysql-test/r/rpl_ddl.result:
  Update result file: a new column DEFINER has been added to
  INFORMATION_SCHEMA.TRIGGERS.
mysql-test/r/rpl_sp.result:
  Update result file: a new clause DEFINER has been added to
  CREATE TRIGGER statement.
mysql-test/r/rpl_trigger.result:
  Results for new test cases were added.
mysql-test/r/skip_grants.result:
  Error message has been changed.
mysql-test/r/trigger.result:
  Added DEFINER column.
mysql-test/r/view.result:
  Error messages have been changed.
mysql-test/r/view_grant.result:
  Error messages have been changed.
mysql-test/t/mysqldump.test:
  Drop created procedure to not affect further tests.
mysql-test/t/rpl_trigger.test:
  Add tests for new column in information schema.
mysql-test/t/skip_grants.test:
  Error tag has been renamed.
mysql-test/t/view.test:
  Error tag has been renamed.
mysql-test/t/view_grant.test:
  Error tag has been changed.
sql/item_func.cc:
  Fix typo in comments.
sql/mysql_priv.h:
  A try to minimize copy&paste:
    - introduce operations to be used from sql_yacc.yy;
    - introduce an operation to be used from trigger and
      view processing code.
sql/share/errmsg.txt:
  - Rename ER_NO_VIEW_USER to ER_MALFORMED_DEFINER in order to
    be shared for view and trigger implementations;
  - Fix a typo;
  - Add a new error code for trigger warning.
sql/sp.cc:
  set_info() was split into set_info() and set_definer().
sql/sp_head.cc:
  set_info() was split into set_info() and set_definer().
sql/sp_head.h:
  set_info() was split into set_info() and set_definer().
sql/sql_acl.cc:
  Add a new check: exit from the cycle if the table is NULL.
sql/sql_lex.h:
  - Rename create_view_definer to definer, since it is used for views
    and triggers;
  - Change st_lex_user to LEX_USER, since st_lex_user is a structure.
    So, formally, it should be "struct st_lex_user", which is longer
    than just LEX_USER;
  - Add trigger_definition_begin.
sql/sql_parse.cc:
  - Add a new check: exit from the cycle if the table is NULL;
  - Implement definer-related functions.
sql/sql_show.cc:
  Add DEFINER column.
sql/sql_trigger.cc:
  Add DEFINER support for triggers.
sql/sql_trigger.h:
  Add DEFINER support for triggers.
sql/sql_view.cc:
  Rename create_view_definer to definer.
sql/sql_yacc.yy:
  Add support for DEFINER-clause in CREATE TRIGGER statement.
  
  Since CREATE TRIGGER and CREATE VIEW can be similar at the start,
  yacc is unable to distinguish between them. So, had to modify both
  statements in order to make it parsable by yacc.
mysql-test/r/trigger-compat.result:
  Result file for triggers backward compatibility test.
mysql-test/r/trigger-grant.result:
  Result file of the test for WL#2818.
mysql-test/t/trigger-compat.test:
  Triggers backward compatibility test: check that the server
  still can load triggers w/o definer attribute and modify
  tables with such triggers (add a new trigger, etc).
mysql-test/t/trigger-grant.test:
  Test for WL#2818 -- check that DEFINER support in triggers
  works properly