1. use MySQL headers instead of system ones;
  2. move logical part of code into a separate function.


server-tools/instance-manager/angel.cc:
  Polishing: try not to use system headers.
  Use headers from include/ directory when it is possible.
server-tools/instance-manager/manager.cc:
  Polishing: move logical part of code into a separate function.
server-tools/instance-manager/manager.h:
  Polishing: move logical part of code into a separate function.
server-tools/instance-manager/mysqlmanager.cc:
  Polishing: rollback rename.

server-tools/instance-manager/WindowsService.cpp:
  Include my_global.h for DBUG_ASSERT.
server-tools/instance-manager/mysqlmanager.cc:
  Include my_dir.h for umask().

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime


sql/sql_parse.cc:
  SCCS merged

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

- Merged from 5.0
- Removed redundant call to set_time(); now included in init_for_queries


sql/ha_ndbcluster.cc:
  Removed redundant call to set_time(); now included in init_for_queries
sql/ha_ndbcluster_binlog.cc:
  Removed redundant call to set_time(); now included in init_for_queries

into  kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240


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

- Starting time of a query sent by bootstrapping wasn't initialized
  and starting time defaulted to 0. This later used value by NOW-
  item and was translated to 1970-01-01 11:00:00.
- Marketing the time with thd->set_time() before the call to
  mysql_parse resolves this issue.
- set_time was refactored to be part of the thd->init_for_queries-
  process.


mysql-test/r/init_file.result:
  Manual merge from 4.1
mysql-test/std_data/init_file.dat:
  Manual merge from 4.1
sql/sql_class.cc:
  - Moved set_time into init_for_queries process.

into  kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240


mysql-test/t/init_file.test:
  Auto merged
BitKeeper/deleted/.del-init_file.result:
  Auto merged
mysql-test/std_data/init_file.dat:
  Null merge
sql/sql_parse.cc:
  Null merge

- Starting time of a query sent by file bootstrapping wasn't initialized
  and starting time defaulted to 0. This later used value by the Now-
  item and is translated to 1970-01-01 11:00:00.
- marking the time with thd->set_time() before the call to 
  mysql_parse resolves this issue.


mysql-test/r/init_file.result:
  Appended test case
mysql-test/std_data/init_file.dat:
  Appended test case
mysql-test/t/init_file.test:
  Appended test case

im_daemon_life_cycle fails randomly.

1. Move IM-angel functionality into a separate file, create Angel class.
2. Be more verbose;
3. Fix typo in FLUSH INSTANCES implementation;
4. Polishing.


mysql-test/r/im_options.result:
  Updated result file.
mysql-test/t/im_cmd_line.imtest:
  Updated test.
server-tools/instance-manager/IMService.cpp:
  Move HandleServiceOptions() into IMService::main().
server-tools/instance-manager/IMService.h:
  Move HandleServiceOptions() into IMService::main().
server-tools/instance-manager/Makefile.am:
  Added angel.cc and angel.h.
server-tools/instance-manager/WindowsService.cpp:
  Initialize class-members in constructor.
server-tools/instance-manager/WindowsService.h:
  Initialize class-members in constructor.
server-tools/instance-manager/commands.cc:
  Return actual error code (ER_OUT_OF_RESOURCES or ER_THERE_IS_ACTIVE_INSTANCE)
  from FLUSH INSTANCES.
server-tools/instance-manager/manager.cc:
  1. Return actual error code from Manager::flush_instances().
  2. Be more verbose.
server-tools/instance-manager/manager.h:
  Return actual error code from Manager::flush_instances().
server-tools/instance-manager/mysqlmanager.cc:
  Move IM-angel functionality into separate file (angel.cc).
server-tools/instance-manager/priv.cc:
  Use return bool datatype instead int{ 0, 1 }.
server-tools/instance-manager/priv.h:
  Use return bool datatype instead int{ 0, 1 }.
server-tools/instance-manager/angel.cc:
  IM-angel functionality.
server-tools/instance-manager/angel.h:
  IM-angel functionality.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/mysql_priv.h:
  Auto merged

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/select.result:
  SCCS merged
mysql-test/t/select.test:
  SCCS merged

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


sql/item.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt


BitKeeper/etc/gone:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/select.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my51-bug25807


BitKeeper/etc/collapsed:
  auto-union
mysys/mf_iocache.c:
  Auto merged

Showstopper and regression against 5.0.24.

Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail.  Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.

This restores the behavior for file-ish objects that could never be 
seek()ed.


mysys/mf_iocache.c:
  If we detect early that the file is not tell()able, then we should
  assume that it's also not seek()able and therefore we should never
  set the (poorly named) "seek_not_done" flag so that we don't immedi-
  ately try to seek() when reading later.
  
  The problem was that tell() was returning -1, so when we read later, 
  we needlessly tried to seek to position  (unsigned long) -1 . 
  
  Also, if we think we're supposed to seek to a position in a file and 
  the file is un-tell()able, then abort.

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/r/view.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/view.test:
  Manual merge

into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge

  Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed


BitKeeper/deleted/.del-README.txt-renamed:
  Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/mysql_priv.h:
  manual merge.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


sql/mysql_priv.h:
  Auto merged

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/information_schema.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/information_schema.test:
  Manual merge
mysql-test/t/view.test:
  Manual merge
mysys/my_pthread.c:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/opt_range.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_update.cc:
  Manual merge

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/r/type_enum.result:
  Use local
mysql-test/t/type_enum.test:
  Use local

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/ignore:
  auto-union

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/gone:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/table.cc:
  Auto merged

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209


sql/sql_select.cc:
  Auto merged

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


libmysqld/lib_sql.cc:
  Auto merged
sql/item.cc:
  Auto merged

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-README.txt:
  Delete: mysql-test/suite/funcs_1/README.txt
BitKeeper/deleted/.del-memory_tb3.txt:
  Delete: mysql-test/suite/funcs_1/data/memory_tb3.txt
BitKeeper/deleted/.del-myisam_storedproc_02.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_03.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
BitKeeper/deleted/.del-myisam_storedproc_06.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
BitKeeper/deleted/.del-myisam_storedproc_07.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
BitKeeper/deleted/.del-myisam_storedproc_08.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
BitKeeper/deleted/.del-myisam_storedproc_10.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
BitKeeper/deleted/.del-myisam_trig_0102.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_0102.result
BitKeeper/deleted/.del-myisam_trig_03.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_03.result
BitKeeper/deleted/.del-myisam_trig_0407.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_0407.result
BitKeeper/deleted/.del-myisam_trig_08.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-memory_tb4.txt:
  Delete: mysql-test/suite/funcs_1/data/memory_tb4.txt
BitKeeper/deleted/.del-myisam_trig_09.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_09.result
BitKeeper/deleted/.del-myisam_trig_1011ext.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-myisam_triggers.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_triggers.result
BitKeeper/deleted/.del-myisam_views.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_views.result
BitKeeper/deleted/.del-cleanup_sp_tb.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-load_sp_tb.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
BitKeeper/deleted/.del-storedproc_02.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
BitKeeper/deleted/.del-storedproc_03.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
BitKeeper/deleted/.del-storedproc_06.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
BitKeeper/deleted/.del-storedproc_07.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
BitKeeper/deleted/.del-myisam_tb1.txt:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb1.txt
BitKeeper/deleted/.del-storedproc_08.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_08_show.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
BitKeeper/deleted/.del-storedproc_10.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-storedproc_master.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
BitKeeper/deleted/.del-a_version_check.test:
  Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-disabled.def~1:
  Delete: mysql-test/suite/funcs_1/t/disabled.def
BitKeeper/deleted/.del-innodb__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
BitKeeper/deleted/.del-innodb__load.test:
  Delete: mysql-test/suite/funcs_1/t/innodb__load.test
BitKeeper/deleted/.del-innodb_bitdata.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_cursors.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_cursors.test
BitKeeper/deleted/.del-myisam_tb2.txt:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb2.txt
BitKeeper/deleted/.del-innodb_func_view.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_func_view.test
BitKeeper/deleted/.del-innodb_storedproc.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc.test
BitKeeper/deleted/.del-innodb_storedproc_02.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_03.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
BitKeeper/deleted/.del-innodb_storedproc_06.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
BitKeeper/deleted/.del-innodb_storedproc_07.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
BitKeeper/deleted/.del-innodb_storedproc_08.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
BitKeeper/deleted/.del-innodb_storedproc_10.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_0102.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_0102.test
BitKeeper/deleted/.del-innodb_trig_03.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_03.test
BitKeeper/deleted/.del-myisam_tb3.txt:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-innodb_trig_0407.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_0407.test
BitKeeper/deleted/.del-innodb_trig_08.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_08.test
BitKeeper/deleted/.del-innodb_trig_09.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_09.test
BitKeeper/deleted/.del-innodb_trig_1011ext.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
BitKeeper/deleted/.del-innodb_trig_frkey.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-innodb_views.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_views.test
BitKeeper/deleted/.del-memory__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
BitKeeper/deleted/.del-memory__load.test:
  Delete: mysql-test/suite/funcs_1/t/memory__load.test
BitKeeper/deleted/.del-memory_bitdata.test:
  Delete: mysql-test/suite/funcs_1/t/memory_bitdata.test
BitKeeper/deleted/.del-memory_cursors.test:
  Delete: mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-myisam_tb4.txt:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb4.txt
BitKeeper/deleted/.del-memory_func_view.test:
  Delete: mysql-test/suite/funcs_1/t/memory_func_view.test
BitKeeper/deleted/.del-memory_storedproc.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc.test
BitKeeper/deleted/.del-memory_storedproc_02.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_02.test
BitKeeper/deleted/.del-memory_storedproc_03.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_03.test
BitKeeper/deleted/.del-memory_storedproc_06.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_07.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_07.test
BitKeeper/deleted/.del-memory_storedproc_08.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_08.test
BitKeeper/deleted/.del-memory_storedproc_10.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_10.test
BitKeeper/deleted/.del-memory_trig_0102.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_0102.test
BitKeeper/deleted/.del-memory_trig_03.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_03.test
BitKeeper/deleted/.del-t3.txt:
  Delete: mysql-test/suite/funcs_1/data/t3.txt
BitKeeper/deleted/.del-memory_trig_0407.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_0407.test
BitKeeper/deleted/.del-memory_trig_08.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_09.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_09.test
BitKeeper/deleted/.del-memory_trig_1011ext.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
BitKeeper/deleted/.del-memory_views.test:
  Delete: mysql-test/suite/funcs_1/t/memory_views.test
BitKeeper/deleted/.del-myisam__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
BitKeeper/deleted/.del-myisam__load.test:
  Delete: mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_bitdata.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_bitdata.test
BitKeeper/deleted/.del-myisam_cursors.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_cursors.test
BitKeeper/deleted/.del-myisam_func_view.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_func_view.test
BitKeeper/deleted/.del-t4.txt:
  Delete: mysql-test/suite/funcs_1/data/t4.txt
BitKeeper/deleted/.del-myisam_storedproc.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc.test
BitKeeper/deleted/.del-myisam_storedproc_02.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
BitKeeper/deleted/.del-myisam_storedproc_03.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
BitKeeper/deleted/.del-myisam_storedproc_06.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_07.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
BitKeeper/deleted/.del-myisam_storedproc_08.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
BitKeeper/deleted/.del-myisam_storedproc_10.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
BitKeeper/deleted/.del-myisam_trig_0102.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_0102.test
BitKeeper/deleted/.del-myisam_trig_03.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_0407.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_0407.test
BitKeeper/deleted/.del-t7.txt:
  Delete: mysql-test/suite/funcs_1/data/t7.txt
BitKeeper/deleted/.del-myisam_trig_08.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_09.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_09.test
BitKeeper/deleted/.del-myisam_trig_1011ext.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
BitKeeper/deleted/.del-myisam_views.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_views.test
BitKeeper/deleted/.del-trig_frkey.inc:
  Delete: mysql-test/suite/funcs_1/triggers/trig_frkey.inc
BitKeeper/deleted/.del-trig_frkey2.inc:
  Delete: mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_0102.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_0102.inc
BitKeeper/deleted/.del-triggers_03.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_03.inc
BitKeeper/deleted/.del-triggers_0407.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_0407.inc
BitKeeper/deleted/.del-triggers_08.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_08.inc
BitKeeper/deleted/.del-t9.txt:
  Delete: mysql-test/suite/funcs_1/data/t9.txt
BitKeeper/deleted/.del-triggers_09.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_09.inc
BitKeeper/deleted/.del-triggers_1011ext.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
BitKeeper/deleted/.del-triggers_master.test:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
BitKeeper/deleted/.del-func_view.inc:
  Delete: mysql-test/suite/funcs_1/views/func_view.inc
BitKeeper/deleted/.del-fv1.inc:
  Delete: mysql-test/suite/funcs_1/views/fv1.inc
BitKeeper/deleted/.del-fv2.inc:
  Delete: mysql-test/suite/funcs_1/views/fv2.inc
BitKeeper/deleted/.del-fv_cast.inc:
  Delete: mysql-test/suite/funcs_1/views/fv_cast.inc
BitKeeper/deleted/.del-fv_if1.inc:
  Delete: mysql-test/suite/funcs_1/views/fv_if1.inc
BitKeeper/deleted/.del-fv_if2.inc:
  Delete: mysql-test/suite/funcs_1/views/fv_if2.inc
BitKeeper/deleted/.del-fv_ifnull.inc:
  Delete: mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-bitdata_master.test:
  Delete: mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-datadict_bug_12777.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
BitKeeper/deleted/.del-views_master.inc:
  Delete: mysql-test/suite/funcs_1/views/views_master.inc
BitKeeper/deleted/.del-readme.txt~2:
  Delete: mysql-test/suite/funcs_2/readme.txt
BitKeeper/deleted/.del-charset_master.test:
  Delete: mysql-test/suite/funcs_2/charset/charset_master.test
BitKeeper/deleted/.del-charset_utf8.txt:
  Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt
BitKeeper/deleted/.del-check_charset.inc:
  Delete: mysql-test/suite/funcs_2/include/check_charset.inc
BitKeeper/deleted/.del-check_charset_ucs2.inc:
  Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
BitKeeper/deleted/.del-check_charset_utf8.inc:
  Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-gen_charset_utf8.pl:
  Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
BitKeeper/deleted/.del-innodb_charset.result:
  Delete: mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-memory_charset.result:
  Delete: mysql-test/suite/funcs_2/r/memory_charset.result
BitKeeper/deleted/.del-datadict_load.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_load.inc
BitKeeper/deleted/.del-myisam_charset.result:
  Delete: mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-ndb_charset.result:
  Delete: mysql-test/suite/funcs_2/r/ndb_charset.result
BitKeeper/deleted/.del-innodb_charset.test:
  Delete: mysql-test/suite/funcs_2/t/innodb_charset.test
BitKeeper/deleted/.del-memory_charset.test:
  Delete: mysql-test/suite/funcs_2/t/memory_charset.test
BitKeeper/deleted/.del-myisam_charset.test:
  Delete: mysql-test/suite/funcs_2/t/myisam_charset.test
BitKeeper/deleted/.del-ndb_charset.test:
  Delete: mysql-test/suite/funcs_2/t/ndb_charset.test
BitKeeper/deleted/.del-datadict_master.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
BitKeeper/deleted/.del-datadict_show_table_design.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
BitKeeper/deleted/.del-datadict_tables.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
BitKeeper/deleted/.del-datadict_tables_error.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
BitKeeper/deleted/.del-cursors_master.test:
  Delete: mysql-test/suite/funcs_1/cursors/cursors_master.test
BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
BitKeeper/deleted/.del-create_database.inc:
  Delete: mysql-test/suite/funcs_1/include/create_database.inc
BitKeeper/deleted/.del-create_user_lowest_priv.inc:
  Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
BitKeeper/deleted/.del-create_user_no_super.inc:
  Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
BitKeeper/deleted/.del-innodb_tb1.inc:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb2.inc:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb2.inc
BitKeeper/deleted/.del-innodb_tb3.inc:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb3.inc
BitKeeper/deleted/.del-innodb_tb4.inc:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb4.inc
BitKeeper/deleted/.del-innodb_tb1.txt:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb1.txt
BitKeeper/deleted/.del-memory_tb1.inc:
  Delete: mysql-test/suite/funcs_1/include/memory_tb1.inc
BitKeeper/deleted/.del-memory_tb2.inc:
  Delete: mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb3.inc:
  Delete: mysql-test/suite/funcs_1/include/memory_tb3.inc
BitKeeper/deleted/.del-memory_tb4.inc:
  Delete: mysql-test/suite/funcs_1/include/memory_tb4.inc
BitKeeper/deleted/.del-myisam_tb1.inc:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb1.inc
BitKeeper/deleted/.del-myisam_tb2.inc:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb2.inc
BitKeeper/deleted/.del-myisam_tb3.inc:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-myisam_tb4.inc:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb4.inc
BitKeeper/deleted/.del-show_connection.inc:
  Delete: mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-sp_tb.inc:
  Delete: mysql-test/suite/funcs_1/include/sp_tb.inc
BitKeeper/deleted/.del-innodb_tb2.txt:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb2.txt
BitKeeper/deleted/.del-DataGen_local.pl:
  Delete: mysql-test/suite/funcs_1/lib/DataGen_local.pl
BitKeeper/deleted/.del-DataGen_modify.pl:
  Delete: mysql-test/suite/funcs_1/lib/DataGen_modify.pl
BitKeeper/deleted/.del-a_version_check.result:
  Delete: mysql-test/suite/funcs_1/r/a_version_check.result
BitKeeper/deleted/.del-innodb__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
BitKeeper/deleted/.del-innodb__load.result:
  Delete: mysql-test/suite/funcs_1/r/innodb__load.result
BitKeeper/deleted/.del-innodb_bitdata.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_bitdata.result
BitKeeper/deleted/.del-innodb_cursors.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_func_view.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_func_view.result
BitKeeper/deleted/.del-innodb_storedproc.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_02.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
BitKeeper/deleted/.del-innodb_tb3.txt:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb3.txt
BitKeeper/deleted/.del-innodb_storedproc_03.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
BitKeeper/deleted/.del-innodb_storedproc_06.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
BitKeeper/deleted/.del-innodb_storedproc_07.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_08.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
BitKeeper/deleted/.del-innodb_storedproc_10.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
BitKeeper/deleted/.del-innodb_trig_0102.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_0102.result
BitKeeper/deleted/.del-innodb_trig_03.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_03.result
BitKeeper/deleted/.del-innodb_trig_0407.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_08.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_08.result
BitKeeper/deleted/.del-innodb_trig_09.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_09.result
BitKeeper/deleted/.del-innodb_tb4.txt:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb4.txt
BitKeeper/deleted/.del-innodb_trig_1011ext.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
BitKeeper/deleted/.del-innodb_trig_frkey.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
BitKeeper/deleted/.del-innodb_triggers.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_triggers.result
BitKeeper/deleted/.del-innodb_views.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_views.result
BitKeeper/deleted/.del-memory__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory__load.result:
  Delete: mysql-test/suite/funcs_1/r/memory__load.result
BitKeeper/deleted/.del-memory_bitdata.result:
  Delete: mysql-test/suite/funcs_1/r/memory_bitdata.result
BitKeeper/deleted/.del-memory_cursors.result:
  Delete: mysql-test/suite/funcs_1/r/memory_cursors.result
BitKeeper/deleted/.del-memory_func_view.result:
  Delete: mysql-test/suite/funcs_1/r/memory_func_view.result
BitKeeper/deleted/.del-memory_storedproc.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc.result
BitKeeper/deleted/.del-memory_tb1.txt:
  Delete: mysql-test/suite/funcs_1/data/memory_tb1.txt
BitKeeper/deleted/.del-memory_storedproc_02.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_02.result
BitKeeper/deleted/.del-memory_storedproc_03.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_03.result
BitKeeper/deleted/.del-memory_storedproc_06.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_06.result
BitKeeper/deleted/.del-memory_storedproc_07.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_08.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_08.result
BitKeeper/deleted/.del-memory_storedproc_10.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_10.result
BitKeeper/deleted/.del-memory_trig_0102.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_0102.result
BitKeeper/deleted/.del-memory_trig_03.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_0407.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_0407.result
BitKeeper/deleted/.del-memory_trig_08.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_08.result
BitKeeper/deleted/.del-memory_tb2.txt:
  Delete: mysql-test/suite/funcs_1/data/memory_tb2.txt
BitKeeper/deleted/.del-memory_trig_09.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_09.result
BitKeeper/deleted/.del-memory_trig_1011ext.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
BitKeeper/deleted/.del-memory_triggers.result:
  Delete: mysql-test/suite/funcs_1/r/memory_triggers.result
BitKeeper/deleted/.del-memory_views.result:
  Delete: mysql-test/suite/funcs_1/r/memory_views.result
BitKeeper/deleted/.del-myisam__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
BitKeeper/deleted/.del-myisam__load.result:
  Delete: mysql-test/suite/funcs_1/r/myisam__load.result
BitKeeper/deleted/.del-myisam_bitdata.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_bitdata.result
BitKeeper/deleted/.del-myisam_cursors.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_cursors.result
BitKeeper/deleted/.del-myisam_func_view.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_func_view.result
BitKeeper/deleted/.del-myisam_storedproc.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc.result
scripts/make_binary_distribution.sh:
  SCCS merged

into  mysql.com:/home/hf/work/25492/my51-25492