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  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:/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/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

into lmy004.:/work/mysql-5.1-bug14356

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  manual merge

into  shellback.:C:/mysql/mysql-5.1-new

into lmy004.:/work/mysql-5.1-bug14356


mysql-test/r/events.result:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
mysql-test/t/events_bugs.test:
  Auto merged

mysql-test/t/partition_mgm_err2.test:
  Need support for partitions

mysql-test/t/disabled.def:
  Adding two more failing tests to the def file.

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

into  rurik.mysql.com:/home/igor/mysql-5.1


include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

into  rurik.mysql.com:/home/igor/mysql-5.0

into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian


BitKeeper/etc/ignore:
  auto-union
include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Changing message to add in bug numnber

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

An invalid assertion in Item_direct_view_ref::eq caused 
an assertion abort in the debug version.


mysql-test/r/view.result:
  Added a test case for bug #18386.
mysql-test/t/view.test:
  Added a test case for bug #18386.
sql/item.cc:
  Fixed bug #18386.
  An invalid assertion in Item_direct_view_ref::eq caused 
  an assertion abort in the debug version.
  Changed the assertion.

into  zim.(none):/home/ian/workspace/mysql-5.0

BitKeeper/etc/ignore:
  Added mysql-test/r/udf.log to the ignore list
mysql-test/t/disabled.def:
  Disable the udf test, per bug #18564. Permission by Brian

There still may be issues on the Window's side from what I can see from doing a grep. 


sql/Makefile.am:
  Removing deleted file.

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

BitKeeper/etc/ignore:
  Added mysql-test/r/bdb.log mysql-test/r/im_client_port.log to the ignore list
client/mysql.cc:
  If --socket is not set, provides --protocol=TCP when --port=
  is specified (and --protocol= is not specified.)

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on
the storage engines given on the command line


BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc
cmakelists.txt:
  use INCLUDE to read in the cmake file generated as part of configure
  comment out the setting of /wd4996 since we are using the -D flag instead
sql/cmakelists.txt:
  include IF() blocks for every storage engine and set two vars that are used with CONFIGURE_FILE later
  in the script.
  This CONFIGURE_FILE call replaces the need for config-handlerton.js
win/configure.js:
  write out proper cmake code instead of just the values.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  Remove Solaris -xc99=none C option as C++ compiler can't handle it


scripts/mysql_config.sh:
  Remove Solaris -xc99=none C option as C++ compiler can't handle it

in older version.

The problem is that TRN-files created in "old" versions contain
junk in trigger_table field, which is not acceptable in "new" versions.


sql/parse_file.cc:
  1. Made parse_escaped_string() available globally;
  2. Polishing: fixing the comments.
sql/parse_file.h:
  Made parse_escaped_string() available globally.
sql/sql_trigger.cc:
  1. Polishing
  2. Removed declaration of global handle_old_incorrect_sql_modes()
     since it is not used anymore.
  3. Added a hook to support invalid "trigger_table" field in TRN-file
     from old versions.

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


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

build, so do not require it to be present in mysql-test-run.pl.