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

sql/sql_table.cc:
  Auto merged

into mysql.com:/M41/mysql-4.1

sql/sql_class.cc:
  we need to check exchange->file_name here

into mysql.com:/home/jonas/src/mysql-4.1

missing prototyped problem (bug#5521).


sql/mysqld.cc:
  Some systems (Unixware, SCO) have no prototypes for 'seteuid()' and
  'setegid()', but have them for 'setreuid()' / 'setregid()'.
  So 'sete_id(__)' calls are replaced by 'setre_id(-1,__)' (bug#5521).

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/dbdata/psergey/mysql-4.1-bug-tina


sql/handler.h:
  Auto merged

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5428

into mysql.com:/home/jonas/src/mysql-4.1

  Bug #5536: wrong server character set in "status" command
  More character set variables.


client/mysql.cc:
  Bug #5536: wrong server character set in "status" command
  More character set variables.

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5428


strings/ctype-simple.c:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

Check g_ndb before deleting it
Wait until ready(10) if get mgm connection

 * Renamed handler::estimate_number_of_rows to handler::estimate_rows_upper_bound function, which can also return "unknown"
 * made filesort to use full sort buffer if number of rows to sort is not known.


sql/examples/ha_tina.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/filesort.cc:
   * Fix for BUG#5117: made filesort() to use full sort buffer if number of rows to sort is not known.
   * Comments and assertion added
sql/ha_berkeley.cc:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_berkeley.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_innodb.cc:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_innodb.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/handler.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1


sql/item_func.cc:
  Auto merged

  Fix typos noticed while poking around in file.


libmysql/libmysql.c:
  Fix typos noticed while poking around in file.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

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

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

  bumped up version to 3.5.1


configure.in:
  bumped up version to 3.5.1

Added code to adjust the field_length of user variables 
in dependence on the field type.
Aded new constants for numeric field widths.


include/mysql_com.h:
  BUG#4788 - show create table provides incorrect statement.
  Introduced definitions for default field width of numeric types.
  So common values can be used at different places in the code.
mysql-test/r/variables.result:
  BUG#4788 - show create table provides incorrect statement.
  New test results.
mysql-test/t/variables.test:
  BUG#4788 - show create table provides incorrect statement.
  Added a test for the bug.
sql/item_func.cc:
  BUG#4788 - show create table provides incorrect statement.
  Added code to adjust the field_length of user variables 
  in dependence on the field type.
sql/sql_parse.cc:
  BUG#4788 - show create table provides incorrect statement.
  Changed numeric literals to the new constants.

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged

mysql-test/r/query_cache.result:
  test of QC with different variables
mysql-test/t/query_cache.test:
  test of QC with different variables
sql/mysql_priv.h:
  new information for query key calculation
sql/sql_cache.cc:
  new information for query key calculation
sql/sql_cache.h:
  removed unused definitions

compile error/warning fixes
added force of heartbeat
added ability to force heartbeat


ndb/src/common/mgmcommon/LocalConfig.cpp:
  added possibility to use comma-separated connectstring
ndb/src/common/mgmcommon/NdbConfig.c:
  compile error/warning fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added force of heartbeat
ndb/src/mgmsrv/main.cpp:
  changed help text
ndb/src/ndbapi/ClusterMgr.cpp:
  added ability to force heartbeat
ndb/src/ndbapi/Ndbinit.cpp:
  added comment

ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  SCCS merged

  removed shhor switch for nodaemon


ndb/src/mgmsrv/main.cpp:
  removed shhor switch for nodaemon