into sanja.is.com.ua:/home/bell/mysql/bk/work-tmp_field-4.1

tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)


sql/item_timefunc.h:
  no need redefine tmp_table_field(), it will be inherited

place


sql/sql_class.h:
  comment moved to correct place

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix

include/my_pthread.h:
  HAVE_GMTIME_R should not be defined under Windows
  (it is ok for HAVE_LOCALTIME_R since there additional implementation 
  in my_windcond.c.

into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1


sql/sql_select.cc:
  Auto merged

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1

into deer.(none):/home/hf/work/mysql-4.1.clean

into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1

This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
  Only 'COMMIT' statement updates the binary log. 
  'ROLLBACK' statement doesn't update the binlog.


mysql-test/r/drop.result:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/r/innodb.result:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/t/drop.test:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/t/innodb.test:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
sql/handler.cc:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
sql/sql_table.cc:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

Fixed some mess with STDCALL in function's declarations


include/mysql.h:
  That definitions are more correct
libmysqld/lib_sql.cc:
  should be declared as STDCALL
libmysqld/libmysqld.c:
  should be declared as STDCALL
sql-common/client.c:
  should be declared as STDCALL

sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/create.result:
  merge
mysql-test/t/create.test:
  merge
sql/item_cmpfunc.h:
  SCCS merged

aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)


mysql-test/r/subselect.result:
  test for BUG#860
mysql-test/t/subselect.test:
  test for BUG#860
sql/item_sum.cc:
  reset() replaced with clear()
sql/item_sum.h:
  reset() replaced with clear()
  (reset now is just composition of clear() and add())
sql/item_uniq.h:
  reset() replaced with clear()
sql/sql_select.cc:
  removed NULL value assigment, now it will be done by clear() call
  function for clearing if there was not found any row in group
sql/sql_select.h:
  function for clearing if there was not found any row in group

into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1


sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

mysql-test/r/create.result:
  added test for bug #910 (right type of ifnull function)
mysql-test/t/create.test:
  added test for bug #910 (right type of ifnull function)
sql/field.h:
  added new constructors of Field_decimal, Field_tiny, Field_short, Field_float,
  Field_null, Field_year
  for using in Item::tmp_table_field_from_field_type
sql/item.cc:
  added Item::tmp_table_field_from_field_type
sql/item.h:
  added Item::tmp_table_field_from_field_type

into narttu.mysql.fi:/my/mysql-4.1

BUILD/FINISH.sh:
  Add just_clean option (for cleanup script)
scripts/mysql_fix_privilege_tables.sql:
  Added 'USE mysql' for easer use on windows
sql/item_sum.cc:
  Changed UDF interface to use clear() instead of reset()
sql/item_sum.h:
  Changed UDF interface to use clear() instead of reset()
sql/slave.cc:
  Fixed checking of eof for slave/master protocol. (Bug #887)
sql/sql_udf.cc:
  Changed UDF interface to use clear() instead of reset()
sql/sql_udf.h:
  Changed UDF interface to use clear() instead of reset()
sql/sql_yacc.yy:
  ERRORS and WARNINGS should not be reserved words
sql/udf_example.cc:
  Changed UDF interface to use clear() instead of reset()

sql/sql_union.cc:
  Some further merge fixes

  Post merge fixes


sql/sql_union.cc:
  Post merge fixes

sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1

mysql-test/r/olap.result:
  new test case for bug
mysql-test/t/olap.test:
  new test case for bug
sql-common/client.c:
  Safety fix

into narttu.mysql.fi:/my/mysql-4.1


sql/sql_yacc.yy:
  Auto merged

BTREE, HASH and RTREE are not reserved symbols anymore


mysql-test/t/loaddata.test:
  Removed empty lines
mysys/my_malloc.c:
  Fixed old style variable name
mysys/my_realloc.c:
  Fixed old style variable name
sql/sql_yacc.yy:
  BTREE, HASH and RTREE are not reserved symbols anymore
sql/table.cc:
  Simple optimization

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1

  Fix for a small error in the merge from 4.0


mysql-test/r/symlink.result:
  Fix for a small error in the merge from 4.0

(./mysql-test-run t/rpl*.test  do same work)

  same as above
sql_lex.h:
  same as above 
sql_union.cc:
  same as aobve
sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result


sql/sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result
sql/sql_union.cc:
  same as aobve
sql/sql_lex.h:
  same as above
mysql-test/r/union.result:
  same as above

mysql-test/r/subselect.result:
  correct result after merging with fixed Item_in_optimiser::fix_left()
mysql-test/t/subselect.test:
  error code changed

sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1

code cleunup


sql/sql_class.h:
  removed unused variables
sql/sql_union.cc:
  quick fix for found row counter
  layout fixed
sql/sql_update.cc:
  lelect_limit in THD is not used

sql/sql_parse.cc:
  Auto merged
sql/sql_union.cc:
  SCCS merged

   distribution. libedit is used by default, one needs to use
   "--with-readline" when compiling with readline instead.


cmd-line-utils/Makefile.am:
   - add both libedit and readline to the source distribution
configure.in:
   - create both Makefiles for libedit and libedit