minor option description change.


sql/mysqld.cc:
  minor option description change.

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

  Collation name fixes.


configure.in:
  Collation name fixes.

  Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.


sql/mysqld.cc:
  Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.

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

- Init _all_ of CREATE_TABLE_REF


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Init _all_ of CREATE_TABLE_REF

  get_options() did an exit(0) after reporting "Too many arguments"


sql/mysqld.cc:
  get_options() did a exit(0) when reporting "Too many arguments"

mysql-test/r/select_found.result:
  explain added
mysql-test/t/select_found.test:
  cleanup. 5000-char long line removed :)
sql/sql_select.cc:
  reverted

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

sql/sql_select.cc:
  typos in comments
  harmless (hopefully) bug in optimizer fixed

  Can't return value from void function


libmysql/libmysql.c:
  Can't return value from void function

into neptunus.(none):/home/magnus/mysql-4.1

ndb/src/kernel/blocks/backup/Backup.hpp:
  SCAN_FRAGCONF contains length of key(s) aswell
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Send correct signal length

mysql-test/ndb/ndb_config_2_node.ini:
  Increase TimeBetweenWatchDogCheck to 30000

into mysql.com:/home/kostja/mysql/mysql-4.1-root

the second is for the rest of time declarations in mysys.


include/my_time.h:
  New declarations moved from mysql_time.h
include/mysql_time.h:
  New declarations moved to my_time.h.
sql/tztime.cc:
  Enforcing Monty's approach to header files.
sql/tztime.h:
  Enforcing Monty's approach to header files: everything is included in
  one place.

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  SCCS merged

into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into mysql.com:/Users/mikron/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Changed URL in error message, page has moved


netware/mysql_test_run.c:
  Changed URL in error message, page has moved
sql/mysqld.cc:
  Changed URL in error message, page has moved
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

testInterpreter is no longer built

Added NDB_DEBUG(--with-debug) and NDB_DEBUG_FULL(--with-debug=full)



configure.in:
  Added NDB_DEBUG(--with-debug) and NDB_DEBUG_FULL(--with-debug=full)

libmysql/libmysql.c:
  Cleanup of conversion part of libmysql (prepared statements protocol):
  - now we have basic support for any conversion sequence:
    when we don't implement direct conversion of given value to requested 
    buffer type (i.e. time -> double, or the other way around) we
    first convert i.e. time -> string and then call string -> double 
    conversion.
    param->offset is now handled only in one place.
  - conversion functions renamed from send_data_{string, long, double}
    to fetch_{string,long,double}_with_conversion. Don't be confused
    with strange diff for send_data_long: I had to move send_data_string
    before all other sends as it's used inside thesm. (Shall we have
    a forward declaration instead?-)
  - a little cleanup in read_binary_{date,time,datetime} - now type of
    date value is set inside these functions, so we can be sure
    that we always return fully filled MYSQL_TIME structure to the user
  - float -> string conversion is fixed to honor param->precision. 
    This is a step forward in fixing bug#4172
tests/client_test.c:
  test fix: now libmysql always sets MYSQL_TIME::time_type field.
  We need to set these fields in the test as later _in values are compared
  with canonical by plain memcmp.

on OSCON)

ndb/src/cw/cpcd/Makefile.am:
  Put cpcd in libexec
ndb/src/cw/cpcd/Process.cpp:
  Fixed reverse check with ulimit
ndb/test/run-test/main.cpp:
  Restart mgm server aswell on test failure.
  Removes problems with nodeid

into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04

Currently one needs 636*1.6*2*noOfReplicas + 184 bytes per record
which amounts to about 4200 bytes per record. The 2 is a bug which
is fixed here as well, noOfReplicas is removed, it was there for
concurrent transactions but it is better to focus on supporting one
large transaction in the cluster. Also decreasing the safety factor
from 1.6 to 1.1.

Also removing unused parameters.

into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

into neptunus.(none):/home/magnus/mysql-4.1

Added NDBCLUSTER to table types which does not support generate. 
Added test case for truncate.


sql/handler.h:
  Add NDBCLUSTER to table types that does not support generate.

Check if there are any operations pending that needs to be taken over to the updating/deleting transaction before closing the scan 


sql/ha_ndbcluster.cc:
  Check ops_pending if there are operations to take over before closing the scan

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

ndb/src/mgmapi/Makefile.am:
  remove ndb_test_mgmapi from Makefile
  as it's has "incorrect" dependencies
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Stop/wait for m_signalRecvThread aswell

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

  make it fail in more useful ways


ndb/test/ndbapi/testOIBasic.cpp:
  try to get correct result even on deadlock