mysql-test/t/csv.test:
  don't use "echo -n -e", as these flags are not supported
  by built-in "echo" commands found on many platforms.

into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv

mysql-test/t/csv.test:
  fix test. In --ps-protocol mode warnings are eaten by the test suite.
  Disable ps-protocol mode for the statements, which throw the warnings
  we look for.

mysql-test/mysql-test-run.pl:
  Merge
sql/mysqld.cc:
  Merge

into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv

Remove "restart-cleanup" not needed any more as a snapshot of the db will be restored after  a failed test case

"ndbcluster_port_slave" => "ndbcluster-port-slave"

mysql-test/t/disabled.def:
  Disabling GIS test

into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv


storage/csv/ha_tina.cc:
  Auto merged

mysql-test/r/csv.result:
  update result file
mysql-test/t/csv.test:
  add more tests
storage/csv/ha_tina.cc:
  post-review fixes & cleanup
storage/csv/ha_tina.h:
  post-review fixes

mysql-test/t/disabled.def:
  Two more disabled tests

client/mysqlslap.c:
  Behavior change

mysql-test/t/disabled.def:
  Adding tests

sql/mysqld.cc:
  Declare variables using "extern C" just as they are declared in srv0srv.c and set_var.cc

into  linux.site:/home/reggie/work/mysql-5.1

cmakelists.txt:
  restored the /wd4996 flag for vs8 compiles
  broke lines to be <= 79 chars in length
sql/cmakelists.txt:
  broke lines to make them not more than 79 chars long
storage/csv/cmakelists.txt:
  New BitKeeper file ``storage/csv/cmakelists.txt''

into  mysql.com:/usr/home/bar/mysql-5.1-new

into  mysql.com:/usr/home/bar/mysql-5.1-new

into  linux.site:/home/reggie/work/mysql-5.1

sql/handlerton-win.cc:
  Rename: BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df -> sql/handlerton-win.cc

into  mysql.com:/usr/local/mysql/tmpbuild

into  mysql.com:/usr/home/bar/mysql-5.1-new


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

  After merge fix.


mysql-test/r/cast.result:
  After merge fix.

into mysql.com:/home/gluh/MySQL/Merge/5.1-new

Bug#18070 Partitions: wrong result on WHERE ... IS NULL
 removed unnecessary code
 added handling of NULL values


mysql-test/r/partition.result:
  Bug#18053 Partitions: crash if null
  Bug#18070 Partitions: wrong result on WHERE ... IS NULL
   test case
mysql-test/t/partition.test:
  Bug#18053 Partitions: crash if null
  Bug#18070 Partitions: wrong result on WHERE ... IS NULL
   test case
sql/opt_range.cc:
  Bug#18053 Partitions: crash if null
  Bug#18070 Partitions: wrong result on WHERE ... IS NULL
   initialisation of part_iter.has_null_value
sql/sql_partition.h:
  Bug#18053 Partitions: crash if null
  Bug#18070 Partitions: wrong result on WHERE ... IS NULL
   added has_null_value

into  mysql.com:/usr/home/bar/mysql-5.0
Bug#15098


mysql-test/t/cast.test:
  Auto merged
mysql-test/r/cast.result:
  After merge fix
sql/field.cc:
  After merge fix

into  mysql.com:/usr/local/mysql/mysql-5.1-win-src


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

BitKeeper/deleted/.del-config-version.js~b31bb5a8:
  Delete: win/config-version.js
BitKeeper/deleted/.del-config-handlerton.js~553d3402:
  Delete: win/config-handlerton.js
cmakelists.txt:
  Clean up configuration, better integration with CMake.
sql/cmakelists.txt:
  Only build ha_xxx.cc for configured storage engines.
  Only link with configured storage engine projects.
win/configure.js:
  Move the task of config-version.js into configure.js.

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/ndb_insert.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged