configure.in:
  Auto merged
mysql-test/include/rpl_stmt_seq.inc:
  Auto merged
mysql-test/r/blackhole.result:
  Auto merged
mysql-test/r/ctype_cp932_binlog.result:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
mysql-test/r/ctype_ucs_binlog.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/r/not_embedded_server.result:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/r/rpl_create_database.result:
  Auto merged
mysql-test/r/rpl_multi_update3.result:
  Auto merged
mysql-test/r/rpl_slave_status.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
mysql-test/t/rpl_ddl.test:
  Auto merged
mysql-test/t/rpl_multi_query.test:
  Auto merged
mysql-test/t/rpl_rewrite_db.test:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
zlib/Makefile.am:
  Auto merged
mysql-test/std_data/trunc_binlog.000001:
  SCCS merged

  Change mode to -rw-rw-r--
Ereport.pl, Ecreate.pl, Ecompare.pl:
  Change mode to -rwxrwxr--


bdb/dist/s_dir:
  Change mode to -rw-rw-r--
myisam/ftbench/Ecompare.pl:
  Change mode to -rwxrwxr--
myisam/ftbench/Ecreate.pl:
  Change mode to -rwxrwxr--
myisam/ftbench/Ereport.pl:
  Change mode to -rwxrwxr--
myisam/ftbench/README:
  Change mode to -rw-rw-r--
myisammrg/myrg_rnext_same.c:
  Change mode to -rw-rw-r--
mysql-test/include/rpl_stmt_seq.inc:
  Change mode to -rw-rw-r--
mysql-test/misc/kill_master.sh:
  Change mode to -rw-rw-r--
mysql-test/r/blackhole.result:
  Change mode to -rw-rw-r--
mysql-test/r/ctype_cp1250_ch.result:
  Change mode to -rw-rw-r--
mysql-test/r/ctype_cp932_binlog.result:
  Change mode to -rw-rw-r--
mysql-test/r/ctype_euckr.result:
  Change mode to -rw-rw-r--
mysql-test/r/ctype_gb2312.result:
  Change mode to -rw-rw-r--
mysql-test/r/ctype_ucs_binlog.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext2.result:
  Change mode to -rw-rw-r--
mysql-test/r/func_des_encrypt.result:
  Change mode to -rw-rw-r--
mysql-test/r/grant2.result:
  Change mode to -rw-rw-r--
mysql-test/r/insert_update.result:
  Change mode to -rw-rw-r--
mysql-test/r/ndb_database.result:
  Change mode to -rw-rw-r--
mysql-test/r/ndb_update.result:
  Change mode to -rw-rw-r--
mysql-test/r/not_embedded_server.result:
  Change mode to -rw-rw-r--
mysql-test/r/query_cache_notembedded.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_create_database.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_drop_db.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_dual_pos_advance.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_insert_select.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_multi_update3.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_multi_update4.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_slave_status.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_trunc_temp.result:
  Change mode to -rw-rw-r--
mysql-test/r/timezone_grant.result:
  Change mode to -rw-rw-r--
mysql-test/std_data/master-bin.000001:
  Change mode to -rw-rw-r--
mysql-test/t/ctype_latin1.test:
  Change mode to -rw-rw-r--
mysql-test/t/fulltext2.test:
  Change mode to -rw-rw-r--
mysql-test/t/gis-rtree.test:
  Change mode to -rw-rw-r--
mysql-test/t/grant2.test:
  Change mode to -rw-rw-r--
mysql-test/t/insert_update.test:
  Change mode to -rw-rw-r--
mysql-test/t/mysqltest.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_ddl.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_insert_ignore.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_multi_query.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_rewrite_db-slave.opt:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_rewrite_db.test:
  Change mode to -rw-rw-r--
mysql-test/t/subselect2.test:
  Change mode to -rw-rw-r--
mysql-test/t/union-master.opt:
  Change mode to -rw-rw-r--
mysys/mf_tempdir.c:
  Change mode to -rw-rw-r--
mysys/my_crc32.c:
  Change mode to -rw-rw-r--
mysys/my_gethwaddr.c:
  Change mode to -rw-rw-r--
mysys/my_getsystime.c:
  Change mode to -rw-rw-r--
scripts/mysql_prepare_privilege_tables_for_5.sql:
  Change mode to -rw-rw-r--
sql/sql_bitmap.h:
  Change mode to -rw-rw-r--
zlib/Makefile.am:
  Change mode to -rw-rw-r--

BitKeeper/deleted/.del-master-bin.001~8917149781db8413:
  Auto merged
myisammrg/myrg_range.c:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/std_data/trunc_binlog.000001:
  Auto merged
mysql-test/t/bulk_replace.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/ctype_tis620.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
mysql-test/t/rpl_commit_after_flush.test:
  Auto merged
mysql-test/t/rpl_free_items.test:
  Auto merged
sql/sql_handler.cc:
  Auto merged

  Change mode to -rw-rw-r--
dbug_add_tags.pl:
  Change mode to -rwxrwxr--


dbug/dbug_add_tags.pl:
  Change mode to -rwxrwxr--
myisammrg/myrg_range.c:
  Change mode to -rw-rw-r--
mysql-test/r/innodb_handler.result:
  Change mode to -rw-rw-r--
mysql-test/r/repair.result:
  Change mode to -rw-rw-r--
mysql-test/std_data/master-bin.001:
  Change mode to -rw-rw-r--
mysql-test/std_data/trunc_binlog.001:
  Change mode to -rw-rw-r--
mysql-test/t/bulk_replace.test:
  Change mode to -rw-rw-r--
mysql-test/t/create_select_tmp.test:
  Change mode to -rw-rw-r--
mysql-test/t/ctype_tis620.test:
  Change mode to -rw-rw-r--
mysql-test/t/handler.test:
  Change mode to -rw-rw-r--
mysql-test/t/innodb_handler.test:
  Change mode to -rw-rw-r--
mysql-test/t/mix_innodb_myisam_binlog-master.opt:
  Change mode to -rw-rw-r--
mysql-test/t/repair.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_commit_after_flush.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_free_items-slave.opt:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_free_items.test:
  Change mode to -rw-rw-r--
scripts/mysql_secure_installation.sh:
  Change mode to -rw-rw-r--
sql/sql_handler.cc:
  Change mode to -rw-rw-r--
support-files/mysql-multi.server.sh:
  Change mode to -rw-rw-r--

into  mysql.com:/home/kgeorge/mysql/5.0/B7549


mysql-test/r/subselect.result:
  Auto merged

replaced get_field(MEM_ROOT *mem, Field *field) with 
get_field(MEM_ROOT *mem, Field *field, String *res).
It allows to avoid strlen().


mysql-test/r/information_schema.result:
  Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
  test case
mysql-test/t/information_schema.test:
  Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
  test case

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

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

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

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

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

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

mysql-test/r/information_schema.result:
  Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
  test case
mysql-test/r/join.result:
  Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
  result fix
mysql-test/t/information_schema.test:
  Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
  test case

into  mysql.com:/home/mysql-5.0-10418


mysql-test/t/outfile.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_str.result:
  expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/r/outfile.result:
  expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/t/func_str.test:
  show that load_file() will return NULL rather than throw an error
  if file doesn't exist

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

 - Don't kill the active connection to the server, instead read 
   the connection id, switch connection and kill the first one from there.


mysql-test/r/rpl_temporary.result:
  Update test result
mysql-test/t/rpl_temporary.test:
  Don't kill our own connection to the server as the result code differs depending 
  on platform.

a worse execution plan than in 4.1 for some queries.
It happened due the fact that at some conditions the 
optimizer always preferred range or full index scan access
methods to lookup access methods even when the latter were much
cheaper. 
The problem was not observed in 4.1 for the reported query
because the WHERE condition was not of a form that could
cause the problem.
Equality propagation introduced on 5.0 added an extra 
predicate and changed the WHERE condition. The new condition
provoked the optimizer to make a bad choice.

The problem was fixed by the patch for bug 17379.


mysql-test/r/select.result:
  Added a test case for bug #18940.
  The problem was fixed by the patch for bug 17379.
mysql-test/t/select.test:
  Added a test case for bug #18940.
  The problem was fixed by the patch for bug 17379.

  Stepped up to 4.0.28


configure.in:
  Stepped up to 4.0.28

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged

When a view statement is compiled on CREATE VIEW time, most of the 
optimizations should not be done. Finding the right optimization 
for a subquery is one of them.
Unfortunately the optimizer is resolving the column references of 
the left expression of IN subqueries in the process of deciding 
witch optimization to use (if needed). So there should be a 
special case in Item_in_subselect::fix_fields() : check the 
validity of the left expression of IN subqueries in CREATE VIEW 
mode and then proceed as normal. 


mysql-test/r/subselect.result:
  test case
mysql-test/r/view.result:
  chnaged explain due to column being resolved
mysql-test/t/subselect.test:
  test case
sql/item_subselect.cc:
  overloaded fix_fields to fix the left_expr in prepare_view_mode
sql/item_subselect.h:
  fix_fields overloaded so it can prepare left_expr

into  mysql.com:/home/mysql-4.1-10418

into  mysql.com:/home/mysql-5.0-19263

  Compile in all character sets in Max (bug#14918)


support-files/mysql.spec.sh:
  Compile in all character sets in Max (bug#14918)

into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0

into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0

into  zippy.(none):/home/cmiller/mysql-5.0__bug19564

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]


mysql-test/r/select.result:
  BUG#17379: Testcase
mysql-test/r/subselect.result:
  BUG#17379: Updated test results
mysql-test/t/select.test:
  BUG#17379: Testcase
sql/opt_range.cc:
  BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
  Make range optimizer together with TABLE::quick_* also return TABLE::quick_n_ranges
sql/sql_select.cc:
  BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
  Re-work best_access_path() to reuse E(#rows(range access)) as
  E(#rows(ref[_or_null](const) access) only when it is appropriate.
sql/table.h:
  BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
  Make range optimizer together with TABLE::quick_* also return TABLE::quick_n_ranges

into  mysql.com:/usr/home/ram/work/mysql-5.0


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

into  zippy.(none):/home/cmiller/mysql-5.0__bug19564

into  mysql.com:/usr/home/ram/work/4.1.b18501


sql/item_timefunc.cc:
  Auto merged

into  mysql.com:/home/kgeorge/mysql/5.0/B18068


sql/sql_select.cc:
  Auto merged

Correct a bug (that I introduced, after using Oracle's database software for 
too many years) where the length of the database-sent data is incorrectly 
used to infer NULLness.


client/mysql.cc:
  No longer use the length of the data to infer whether it is NULL or not.
mysql-test/r/mysql.result:
  Add result and version marker, and correct previous result.
mysql-test/t/mysql.test:
  Add test and version marker

into  mysql.com:/home/psergey/mysql-5.0-best_access_path_j-push

into  mysql.com:/home/psergey/mysql-5.0-best_access_path_j-push


sql/sql_select.cc:
  Auto merged

into  xiphis.org:/home/antony/work2/mysql-5.0-engines-merge

into  xiphis.org:/home/antony/work2/p1-bug10952.1


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


mysql-test/r/blackhole.result:
  test for bug#10952
mysql-test/r/merge.result:
  test for bug#10952
mysql-test/t/blackhole.test:
  test for bug#10952
mysql-test/t/merge.test:
  test for bug#10952
sql/ha_blackhole.cc:
  Bug#10952
    shouldn't be able to alter a table into a blackhole
sql/ha_myisammrg.cc:
  Bug#10952
    shouldn't be able to alter a table into a merge
sql/handler.h:
  Bug#10952
    new handlerton flag
sql/sql_table.cc:
  Bug#10952
    If alter is changing engine, check if new engine allows creating table
    via ALTER statement.