Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets


mysql-test/r/ndb_charset.result:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/t/ndb_charset.test:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  Fix ndb_limit, handle cmpDate of length 3

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

ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 merge fix 5.0 -> 5.0-ndb

ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb

ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes

client/mysql.cc:
  Auto merged
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge

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

client/mysql.cc:
  few harmless warnings from automated code-checking tools fixed
  cleanup

into mysql.com:/home/jwinstead2/mysql-4.1-clean

  wl-1442 comment for 4.1->5.0


ndb/include/ndb_constants.h:
  wl-1442 comment for 4.1->5.0

mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25

about parallelism (Guide section).


ndb/include/ndbapi/Ndb.hpp:
  Fixed some typos and added note about parallelism 
  (Guide section).

into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged

added example to ndbapi docs


ndb/include/mgmapi/mgmapi.h:
  fixed some mgmapi docs
ndb/include/ndbapi/Ndb.hpp:
  added examples
ndb/src/mgmapi/mgmapi.cpp:
  removed unused parameter

Programmers Guide section.)


ndb/include/ndbapi/Ndb.hpp:
  More fixes/edits (finished NDB Programmers Guide section.)

mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Date.  reuses old unused Timespec type id
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
sql/ha_ndbcluster.cc:
  wl-1442 fix Date.  reuses old unused Timespec type id

mysql-test/r/ndb_index_ordered.result:
  wl-1442 missed result file

into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb

ndb/include/ndbapi/Ndb.hpp:
  Edits for Alcatel PDF version (first set).

mysql-test/t/ndb_index_ordered.test:
  wl-1442 datetime ordering
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 datetime ordering

into build.mysql.com:/users/tulin/mysql-5.0-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into build.mysql.com:/users/tulin/mysql-5.0-ndb

ndb/include/ndbapi/Ndb.hpp:
  Testing a ref.

cmd-line-utils/libedit/makelist.sh:
  Spell out the character range for braindead versions of tr
  (like /usr/xpg4/bin/tr on Sun Solaris 2.10)

into build.mysql.com:/users/tulin/mysql-5.0-ndb

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1442 minor
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1442 minor
sql/ha_ndbcluster.cc:
  wl-1442 minor

mysql-test/r/type_float.result:
  Update warning messages
mysql-test/r/type_float.result.es:
  Update warning messages

that used to fix it was removed in a merge, and now the alter table
that fixes the length comes before the create table so it fixes
pre-existing tables but not the newly-created one).


scripts/mysql_fix_privilege_tables.sql:
  Create columns_priv with correct column lengths

into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged

with a number of decimals specified. (Bug #7361)


mysql-test/t/type_float.test:
  Add test for maximum values of float and double columns with number of decimals
mysql-test/r/type_float.result:
  Add results for new test
mysql-test/r/type_float.result.es:
  Add results for new test
sql/field.cc:
  Use ::store(double nr) from ::store(longlong nr) so we get the same range checking

ndb/include/ndbapi/Ndb.hpp:
  Some editing/cleanup.

sql/handler.cc:
  ha_row_type[]: Add REDUNDANT and COMPACT
sql/handler.h:
  enum row_type: Add ROW_TYPE_REDUNDANT and ROW_TYPE_COMPACT
sql/ha_innodb.cc:
  ha_innobase::create(): Detect ROW_TYPE=REDUNDANT
sql/lex.h:
  Add "COMPACT" (COMPACT_SYM) and "REDUNDANT" (REDUNDANT_SYM)
sql/sql_yacc.yy:
  row_types, keyword: Add COMPACT and REDUNDANT

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

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

configure.in:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  manually merged