include/Makefile.am:
  Remove abi_check from BUILT_SOURCES it's in the "all" rule
  Make abi_check depend on mysql_h.ic as well

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

mysql-test/lib/mtr_stress.pl:
  "stop_masters" function renamed to "stop_all_servers"
  "path_mysock" renamed to "path_sock"

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
myisam/sort.c:
  Manual merge(double checked)
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
mysys/mf_iocache.c:
  Manual merge

mysql-test/r/mysql.result:
  Update test result after commenting out the test
mysql-test/t/mysql.test:
  Rewrite the test commands so they don't depend on "echo" behaviour
  Comment out one as it's a duplicate

client/mysqltest.c:
  The expanded command executed by mysqltest is in ds_cmd

into  neptunus.(none):/home/msvensson/mysql/my50-m-stress

Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that.

into  neptunus.(none):/home/msvensson/mysql/my50-m-stress

mysql-test/lib/mtr_misc.pl:
  Update comments
mysql-test/mysql-test-run.pl:
  Also need to look in "$glob_basedir/bin"

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

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


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.

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


configure.in:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
myisam/sort.c:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
mysys/mf_iocache.c:
  Manual merge.

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

  Raise version number to 4.1.23


configure.in:
  Raise version number to 4.1.23

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


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

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  manual merge

Visual Studio builds each configuration in a different sub-directory.  Only the sub-
directories for release and debug are currently searched.


mysql-test/lib/mtr_misc.pl:
  Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
  - Added usage comments.
mysql-test/mysql-test-run.pl:
  Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
  - Moved Initial_Setup function to the command_line_setup function.
  - Defined new argument vs-config which can be used to inidicate the VS Configuration
  used to create the test executables. Argument can also be controlled with
  MTR_VS_CONFIG environment variable.

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint

- 'false' not defined in C, use FALSE instead.


mysys/my_lock.c:
  Fixed error in windows built:
  'false' not defined in C, use FALSE instead.

- 'false' not defined in C, use FALSE instead.


mysys/my_lock.c:
  Fixed error for windwos built:
  'false' not defined in C, use FALSE instead.

into  mysql.com:/usr/home/ram/work/bug22913/my41-bug22913


client/mysql.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913


client/mysql.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913


client/mysql.cc:
  Auto merged

We don't check for errors that may occur during data printing.


client/mysql.cc:
  Fix for bug #22913: mysql --quick doesn't report some errors.
    - check for errors after the data output.

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-4.1-runtime


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint


mysys/my_chsize.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
mysys/mf_iocache.c:
  Merged patch:
  - Moved comments
  - Moved check on return value of my_seek.

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

  bug#21052


ndb/src/mgmsrv/Services.cpp:
  revert bug to wait for "proper" bug fix

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


include/mysql_h.ic:
  C
  Use local
include/Makefile.am:
  Manual merge

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2


sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged