mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl  :  Output the usage error if one is given. (Found when fixing bug#20303)


mysql-test/mysql-test-run.pl:
  Found when fixing bug#20303: The "usage()" function ignored the message it was given,
  so we got no real indication about the problem. Print it if one is given.

mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl  :    A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"


mysql-test/mysql-test-run.pl:
  A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument":
  Due to the use of 'pass_through' in option processing this lone '--' will remain
  as an argument, it must be ignored explicitly.

into  vadima.volia.com:/root/mysql-5.1-new1


sql/sql_class.cc:
  Auto merged

  Added accessor to handler data.


sql/mysql_priv.h:
  Added accessor to handler data.
sql/sql_class.cc:
  Added accessor to handler data.

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new

horrible when checked out on Windows.


win/README:
  Turn on EOLN_NATIVE flag

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/data0/mysqldev/my/mysql-5.1-new


configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

Removing ./r/rpl_ndb_dd_partitions.result & ./t/rpl_ndb_dd_partitions.test since NDB only will support key partitions and moving them to the test-extra tree for safe keeping


BitKeeper/deleted/.del-rpl_ndb_dd_partitions.result~9b09a8594e474be5:
  Delete: mysql-test/r/rpl_ndb_dd_partitions.result
BitKeeper/deleted/.del-rpl_ndb_dd_partitions.test~9a3f50999ab31151:
  Delete: mysql-test/t/rpl_ndb_dd_partitions.test

sql/ha_ndbcluster.cc:
  compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/share/errmsg.txt:
  Auto merged

into  mysql.com:/space/pekka/ndb/version/my51

into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/r/ndb_basic.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged

mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304

mysql-test/r/ndb_basic.result:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
mysql-test/t/ndb_alter_table.test:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
sql/ha_ndbcluster.cc:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
sql/ha_ndbcluster.h:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex

storage/ndb/src/ndbapi/ndberror.c:
  delete non-sense error 4336
storage/ndb/include/ndbapi/Ndb.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/DictCache.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/DictCache.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/Ndb.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges

The previous patch fixed the csv engine to support dos, linux, and mac line endings.  The patch, however, had
a problem when the table only has a single record in it.  This patch corrects that.

ha_tina.cc:
  Fix problem with previous patch when there is only one record in the table


storage/csv/ha_tina.cc:
  Fix problem with previous patch when there is only one record in the table

  After merge fix


sql/sql_select.cc:
  After merge fix

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge

into  big_geek.:D:/work/mysql/mysql-5.1-vc71

include/config-win.h:
  force time_t to be 32 bit on Visual C++ 2005 or later
sql/net_serv.cc:
  include winsock after my_global so the time_t #define can take effect
storage/csv/ha_tina.cc:
  fix the csv engine so that it supports DOS, Unix, and Mac line endings

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304


sql/partition_info.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/share/errmsg.txt:
  manual merge

Review fix


sql/partition_info.cc:
  Review fix

mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

  Fix mtr_exe_exists to work on win32


mysql-test/lib/mtr_misc.pl:
  Fix mtr_exe_exists to work on win32

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/data0/mysqldev/my/mysql-5.1-release


extra/comp_err.c:
  Auto merged
mysql-test/r/ctype_sjis.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged

into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release


scripts/mysqld_multi.sh:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged
extra/comp_err.c:
  merged

into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release


tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged
sql/sql_lex.cc:
  merged

  Changed version to 5.0.22


configure.in:
  Changed version to 5.0.22

into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1

into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1