into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/4.1

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

  Stepped up to 4.0.28


configure.in:
  Stepped up to 4.0.28

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

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


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

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


sql/item_timefunc.cc:
  Auto merged

Binlog lacks encoding info about DROPped temporary table.

Idea of the fix is to switch temporary to system_charset_info when a temporary table
is DROPped for binlog. Since that is the server, that automatically, but not the client, who generates the query
the binlog should be updated on the server's encoding for the coming DROP.
The `write_binlog_with_system_charset()' is introduced to replace similar problematic places in the code.


mysql-test/r/drop_temp_table.result:
  results changed
mysql-test/r/mix_innodb_myisam_binlog.result:
  results changed
mysql-test/r/mysqlbinlog.result:
  results changed
mysql-test/r/rpl_temporary.result:
  results changed
mysql-test/t/mysqlbinlog.test:
  Check roll-forward recovery from binlog where there are DROP temporary tables created
  in koi8r.
mysql-test/t/rpl_temporary.test:
  Check slave digests binlog with DROP temporary tables created in koi8r.
sql/mysql_priv.h:
  `write_binlog_with_system_charset()' is added to be called when a binlog event
  is created "implicitly" like DROP temporary table is case of closing connection.
sql/sql_base.cc:
  Idea of the fix is to switch temporary to system_charset_info when a temporary table
  is DROPped for binlog. Since that is the server, not the client, who generates the query
  the binlog should be updated on server's encoding for the coming DROP.

load_file() string-function should return NULL rather than throw an error if
the file doesn't exist, as per the manual.


mysql-test/t/outfile.test:
  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
mysql-test/r/outfile.result:
  expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/r/func_str.result:
  expect NULL rather than error if file given to load_file() doesn't exist
sql/item_strfunc.cc:
  load_file() should return NULL as per the docs if file not found,
  rather than throw an error

into  rurik.mysql.com:/home/igor/mysql-4.1

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug19136_unass_user_var


sql/item_func.cc:
  Auto merged

A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct 
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.



mysql-test/r/having.result:
  Added a test case for bug #14927.
mysql-test/t/having.test:
  Added a test case for bug #14927.
sql/sql_lex.cc:
  Fixed bug #14927.
  Initialized fields for having conditions in  st_select_lex::init_query().
sql/sql_lex.h:
  Fixed bug #14927.
  Added a field to restore having condititions for execution in SP and PS.
sql/sql_prepare.cc:
  Fixed bug #14927.
  Added code to restore havinf conditions for execution in SP and PS.
sql/sql_select.cc:
  Fixed bug #14927.
  Performed evaluation of constant expressions in having clauses.
  If the having condition contains a constant conjunct that is always false
  an empty result set is returned after the optimization phase.
  In this case the corresponding EXPLAIN command now returns 
  "Impossible HAVING" in the last column.

into mysql.com:/home/psergey/mysql-4.1-bug16798

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501

into  mysql.com:/home/mydev/mysql-4.0-bug10405

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501

mysql-test/r/func_misc.result:
  Update the result.

into  mysql.com:/home/mydev/mysql-4.1-bug10405

into mysql.com:/home/psergey/mysql-4.1-bug16798

The bug was as follows: When merge_key_fields() encounters "t.key=X OR t.key=Y" it will 
try to join them into ref_or_null access via "t.key=X OR NULL". In order to make this 
inference it checks if Y<=>NULL, ignoring the fact that value of Y may be not yet known.

The fix is that the check if Y<=>NULL is made only if value of Y is known (i.e. it is a
constant).
TODO: When merging to 5.0, replace used_tables() with const_item() everywhere in merge_key_fields().


mysql-test/r/innodb_mysql.result:
  Testcase for BUG16798
mysql-test/t/innodb_mysql.test:
  Testcase for BUG16798
sql/sql_select.cc:
  BUG#16798: Inapplicable ref_or_null query plan and bad query result on random occasions 
  In merge_key_fields() don't call val->is_null() if the value of val is not known.

The reason of the bug is in that `get_var_with_binlog' performs missed
assingment of
the variables as side-effect. Doing that it eventually calls
`free_underlaid_joins' to pass as an argument `thd->lex->select_lex' of the lex
which belongs to the user query, not 
to one which is emulated i.e SET @var1:=NULL.


`get_var_with_binlog' is refined to supply a temporary lex to sql_set_variables's stack.


mysql-test/r/rpl_user_variables.result:
  results changed
mysql-test/t/rpl_user_variables.test:
  a problematic query to be binlogged is added
sql/item_func.cc:
  BUG#19136: Crashing log-bin and uninitialized user variables
  
  The reason of the bug is in that how `get_var_with_binlog' performs missed
  assingment of the variables: `free_underlaid_joins' gets as an argument `thd->lex->select_lex'
  which belongs to the user query, not to one which is emulated i.e SET @var1:=NULL.
  
  `get_var_with_binlog' is refined to supply a temporary lex to sql_set_variables's stack.

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Delete: Docs/changelog-4.1.xml


BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Delete: Docs/changelog-4.1.xml

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Delete: Docs/changelog-4.0.xml


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Delete: Docs/changelog-4.0.xml

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

TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column


mysql-test/r/date_formats.result:
  Added test case for Bug#11324,
  "TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"
mysql-test/t/date_formats.test:
  Added test case for Bug#11324,
  "TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"

mysql-test/r/date_formats.result:
  Added test cases for Bug#11326
mysql-test/t/date_formats.test:
  Added test cases for Bug#11326

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

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372

into  hundin.mysql.fi:/home/jani/mysql-4.1


sql/sql_show.cc:
  Auto merged

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501

into  mysql.com:/home/mysql-4.1-19025e