into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/deleted/.del-fill_func_tables.sh:
  Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
  Auto merged

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


BitKeeper/deleted/.del-fill_func_tables.sh:
  Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
  Auto merged

  Delete: scripts/fill_func_tables.sh
.del-fill_help_tables.sh:
  Delete: scripts/fill_help_tables.sh
.del-internals.texi:
  Delete: Docs/internals.texi


BitKeeper/deleted/.del-internals.texi:
  Delete: Docs/internals.texi
BitKeeper/deleted/.del-fill_func_tables.sh:
  Delete: scripts/fill_func_tables.sh
BitKeeper/deleted/.del-fill_help_tables.sh:
  Delete: scripts/fill_help_tables.sh

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
  Auto merged
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
  Auto merged
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
  Auto merged
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
  Auto merged
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
  Auto merged
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
  Auto merged
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
  Auto merged
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
  Auto merged
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
  Auto merged
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
  Auto merged
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
  Auto merged
BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e:
  Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e:
  Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a:
  Auto merged
BitKeeper/deleted/.del-docbook-split~be931c3922898d0:
  Auto merged
BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9:
  Auto merged
BitKeeper/deleted/.del-make-makefile~39fd454b487126e8:
  Auto merged
BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a:
  Auto merged
BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec:
  Auto merged
BitKeeper/deleted/.del-xwf~76b97805d9146b80:
  Auto merged
BitKeeper/deleted/.del-.cvsignore~250f630140b90042:
  Auto merged
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt~6e5b88fe4217504d:
  Auto merged
BitKeeper/deleted/.del-algor.gif~72c40c3bad198f2f:
  Auto merged
BitKeeper/deleted/.del-algor.txt~37d2b5c1290e3cfa:
  Auto merged
BitKeeper/deleted/.del-bk.txt~ffd510fa9531f87c:
  Auto merged
BitKeeper/deleted/.del-dubois.gif~e02d361b13b1c4a4:
  Auto merged
BitKeeper/deleted/.del-dubois.txt~998581cf9040fcc:
  Auto merged
BitKeeper/deleted/.del-ecomm.gif~f9bce6949b171613:
  Auto merged
BitKeeper/deleted/.del-ecomm.txt~27494674104ee9db:
  Auto merged
BitKeeper/deleted/.del-in_21.gif~4a0b14f6d76458a9:
  Auto merged
BitKeeper/deleted/.del-in_21.txt~448fb4b3d8c0b34e:
  Auto merged
BitKeeper/deleted/.del-manual.gif~657cf08119b1b3fc:
  Auto merged
BitKeeper/deleted/.del-manual.txt~4702af61ea5e3c29:
  Auto merged
BitKeeper/deleted/.del-msql.gif~72ea7c6d307b9108:
  Auto merged
BitKeeper/deleted/.del-msql.txt~235ae568824f4073:
  Auto merged
BitKeeper/deleted/.del-mysql-01.gif~6f3f2e474b834ac6:
  Auto merged
BitKeeper/deleted/.del-mysql-02.gif~5e03e2ffa6bd060f:
  Auto merged
BitKeeper/deleted/.del-mysql-03.gif~a510e3599346cd5f:
  Auto merged
BitKeeper/deleted/.del-mysql-04.gif~6c3fdc91da64574:
  Auto merged
BitKeeper/deleted/.del-mysql-05.gif~230c28315136655:
  Auto merged
BitKeeper/deleted/.del-mysql-06.gif~8bb16461fd45634e:
  Auto merged
BitKeeper/deleted/.del-dbi.gif~8f6861147437298b:
  Auto merged
BitKeeper/deleted/.del-dbi.txt~f5cf3fe321168fd5:
  Auto merged
BitKeeper/deleted/.del-mysql-07.gif~b86f918998a2114e:
  Auto merged
BitKeeper/deleted/.del-mysql-08.gif~50fb4d886f82e8bc:
  Auto merged
BitKeeper/deleted/.del-mysql-09.gif~17604ce9d92cd94a:
  Auto merged
BitKeeper/deleted/.del-mysql-10.gif~a8b5306c4d911f8e:
  Auto merged
BitKeeper/deleted/.del-mysql-11.gif~8495404458978524:
  Auto merged
BitKeeper/deleted/.del-mysql-12.gif~18d47c1ad5aef481:
  Auto merged
BitKeeper/deleted/.del-mysql-13.gif~1ad2eedf58da3aaa:
  Auto merged
BitKeeper/deleted/.del-mysql-14.gif~a11e7df8653ad1b1:
  Auto merged
BitKeeper/deleted/.del-mysql-15.gif~64c998fdd6fc1ae1:
  Auto merged
BitKeeper/deleted/.del-mysql-16.gif~6a6c86de2f85f0f5:
  Auto merged
BitKeeper/deleted/.del-mysql-17.gif~b07962578d0952b1:
  Auto merged
BitKeeper/deleted/.del-mysql-compatible.jpg~56ecc684688a7382:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-01.gif~d27d4f0c1a2a6da9:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-02.gif~476224d724007343:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-03.gif~470dd9c9a8bd55fc:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-04.gif~14f429c87c0c718:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-05.gif~e63e7f003b77ad95:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-06.gif~d9cffaf35d9d4719:
  Auto merged
BitKeeper/deleted/.del-prof.gif~2fa8ed201d9d05fe:
  Auto merged
BitKeeper/deleted/.del-prof.txt~9fc04ec3e5ce8361:
  Auto merged
BitKeeper/deleted/.del-pthreads.gif~2d9460dec2577859:
  Auto merged
BitKeeper/deleted/.del-pthreads.txt~fc9e17d021335a39:
  Auto merged
BitKeeper/deleted/.del-realmen.gif~86113e3b1fcbd597:
  Auto merged
BitKeeper/deleted/.del-realmen.txt~81c30565a8f06539:
  Auto merged
BitKeeper/deleted/.del-sql-99.gif~df369376884a5689:
  Auto merged
BitKeeper/deleted/.del-sql-99.txt~eff316adac3dd5b8:
  Auto merged
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch~40d336454ecf98db:
  Auto merged

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


BitKeeper/deleted/.del-colspec-fix.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-split:
  Auto merged
BitKeeper/deleted/.del-make-docbook:
  Auto merged
BitKeeper/deleted/.del-make-makefile:
  Auto merged
BitKeeper/deleted/.del-test-make-manual-de:
  Auto merged
BitKeeper/deleted/.del-test-make-manual:
  Auto merged
BitKeeper/deleted/.del-xwf:
  Auto merged

into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


BitKeeper/deleted/.del-net_doc.txt:
  Auto merged

  Docs/Books/
  Docs/MySQL-logos/
Deleted files
  Docs/Tutorial-MySQL-final.txt
  Docs/bk.txt
  Docs/Support/.cvsignore
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/trivial-makeinfo-4.0c.patch
  Docs/Support/xwf
Deleted file now in internals main text
  Docs/my_sys.txt
Deleted file now in internals svn tree
  Docs/net_doc.txt
Removed obsolete entries
  Docs/.cvsignore
Added note that info is obsolete
  Docs/linuxthreads.txt


BitKeeper/deleted/.del-colspec-fix.pl:
  Delete: Docs/Support/colspec-fix.pl
BitKeeper/deleted/.del-docbook-fixup.pl:
  Delete: Docs/Support/docbook-fixup.pl
BitKeeper/deleted/.del-docbook-prefix.pl:
  Delete: Docs/Support/docbook-prefix.pl
BitKeeper/deleted/.del-docbook-split:
  Delete: Docs/Support/docbook-split
BitKeeper/deleted/.del-make-docbook:
  Delete: Docs/Support/make-docbook
BitKeeper/deleted/.del-make-makefile:
  Delete: Docs/Support/make-makefile
BitKeeper/deleted/.del-test-make-manual-de:
  Delete: Docs/Support/test-make-manual-de
BitKeeper/deleted/.del-test-make-manual:
  Delete: Docs/Support/test-make-manual
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch:
  Delete: Docs/Support/trivial-makeinfo-4.0c.patch
BitKeeper/deleted/.del-xwf:
  Delete: Docs/Support/xwf
BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
  Delete: Docs/Books/algor.eps
BitKeeper/deleted/.del-algor.gif:
  Delete: Docs/Books/algor.gif
BitKeeper/deleted/.del-algor.txt:
  Delete: Docs/Books/algor.txt
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
  Delete: Docs/Books/dbi.eps
BitKeeper/deleted/.del-dbi.gif:
  Delete: Docs/Books/dbi.gif
BitKeeper/deleted/.del-dbi.txt:
  Delete: Docs/Books/dbi.txt
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
  Delete: Docs/Books/dubois.eps
BitKeeper/deleted/.del-dubois.gif:
  Delete: Docs/Books/dubois.gif
BitKeeper/deleted/.del-dubois.txt:
  Delete: Docs/Books/dubois.txt
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
  Delete: Docs/Books/ecomm.eps
BitKeeper/deleted/.del-ecomm.gif:
  Delete: Docs/Books/ecomm.gif
BitKeeper/deleted/.del-ecomm.txt:
  Delete: Docs/Books/ecomm.txt
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
  Delete: Docs/Books/in_21.eps
BitKeeper/deleted/.del-in_21.gif:
  Delete: Docs/Books/in_21.gif
BitKeeper/deleted/.del-in_21.txt:
  Delete: Docs/Books/in_21.txt
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
  Delete: Docs/Books/manual.eps
BitKeeper/deleted/.del-manual.gif:
  Delete: Docs/Books/manual.gif
BitKeeper/deleted/.del-manual.txt:
  Delete: Docs/Books/manual.txt
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
  Delete: Docs/Books/msql.eps
BitKeeper/deleted/.del-msql.gif:
  Delete: Docs/Books/msql.gif
BitKeeper/deleted/.del-msql.txt:
  Delete: Docs/Books/msql.txt
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
  Delete: Docs/Books/prof.eps
BitKeeper/deleted/.del-prof.gif:
  Delete: Docs/Books/prof.gif
BitKeeper/deleted/.del-prof.txt:
  Delete: Docs/Books/prof.txt
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
  Delete: Docs/Books/pthreads.eps
BitKeeper/deleted/.del-pthreads.gif:
  Delete: Docs/Books/pthreads.gif
BitKeeper/deleted/.del-pthreads.txt:
  Delete: Docs/Books/pthreads.txt
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
  Delete: Docs/Books/realmen.eps
BitKeeper/deleted/.del-realmen.gif:
  Delete: Docs/Books/realmen.gif
BitKeeper/deleted/.del-realmen.txt:
  Delete: Docs/Books/realmen.txt
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
  Delete: Docs/Books/sql-99.eps
BitKeeper/deleted/.del-sql-99.gif:
  Delete: Docs/Books/sql-99.gif
BitKeeper/deleted/.del-sql-99.txt:
  Delete: Docs/Books/sql-99.txt
BitKeeper/deleted/.del-mysql-01.gif:
  Delete: Docs/MySQL-logos/mysql-01.gif
BitKeeper/deleted/.del-mysql-02.gif:
  Delete: Docs/MySQL-logos/mysql-02.gif
BitKeeper/deleted/.del-mysql-03.gif:
  Delete: Docs/MySQL-logos/mysql-03.gif
BitKeeper/deleted/.del-mysql-04.gif:
  Delete: Docs/MySQL-logos/mysql-04.gif
BitKeeper/deleted/.del-mysql-05.gif:
  Delete: Docs/MySQL-logos/mysql-05.gif
BitKeeper/deleted/.del-mysql-06.gif:
  Delete: Docs/MySQL-logos/mysql-06.gif
BitKeeper/deleted/.del-mysql-07.gif:
  Delete: Docs/MySQL-logos/mysql-07.gif
BitKeeper/deleted/.del-mysql-08.gif:
  Delete: Docs/MySQL-logos/mysql-08.gif
BitKeeper/deleted/.del-mysql-09.gif:
  Delete: Docs/MySQL-logos/mysql-09.gif
BitKeeper/deleted/.del-mysql-10.gif:
  Delete: Docs/MySQL-logos/mysql-10.gif
BitKeeper/deleted/.del-mysql-11.gif:
  Delete: Docs/MySQL-logos/mysql-11.gif
BitKeeper/deleted/.del-mysql-12.gif:
  Delete: Docs/MySQL-logos/mysql-12.gif
BitKeeper/deleted/.del-mysql-13.gif:
  Delete: Docs/MySQL-logos/mysql-13.gif
BitKeeper/deleted/.del-mysql-14.gif:
  Delete: Docs/MySQL-logos/mysql-14.gif
BitKeeper/deleted/.del-mysql-15.gif:
  Delete: Docs/MySQL-logos/mysql-15.gif
BitKeeper/deleted/.del-mysql-16.gif:
  Delete: Docs/MySQL-logos/mysql-16.gif
BitKeeper/deleted/.del-mysql-17.gif:
  Delete: Docs/MySQL-logos/mysql-17.gif
BitKeeper/deleted/.del-mysql-compatible.jpg:
  Delete: Docs/MySQL-logos/mysql-compatible.jpg
BitKeeper/deleted/.del-mysql_anim-01.gif:
  Delete: Docs/MySQL-logos/mysql_anim-01.gif
BitKeeper/deleted/.del-mysql_anim-02.gif:
  Delete: Docs/MySQL-logos/mysql_anim-02.gif
BitKeeper/deleted/.del-mysql_anim-03.gif:
  Delete: Docs/MySQL-logos/mysql_anim-03.gif
BitKeeper/deleted/.del-mysql_anim-04.gif:
  Delete: Docs/MySQL-logos/mysql_anim-04.gif
BitKeeper/deleted/.del-mysql_anim-05.gif:
  Delete: Docs/MySQL-logos/mysql_anim-05.gif
BitKeeper/deleted/.del-mysql_anim-06.gif:
  Delete: Docs/MySQL-logos/mysql_anim-06.gif
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt:
  Delete: Docs/Tutorial-MySQL-final.txt
BitKeeper/deleted/.del-net_doc.txt:
  Delete: Docs/net_doc.txt
BitKeeper/deleted/.del-my_sys.txt:
  Delete: Docs/my_sys.txt
BitKeeper/deleted/.del-bk.txt:
  Delete: Docs/bk.txt
BitKeeper/deleted/.del-.cvsignore:
  Delete: Docs/Support/.cvsignore
Docs/.cvsignore:
  Removed obsolete entries
Docs/linuxthreads.txt:
  Added note info is obsolete

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BUILD/check-cpu:
  Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~14:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

  Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO


extra/yassl/taocrypt/benchmark/Makefile.am:
  Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
mysys/CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


BUILD/check-cpu:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701


BUILD/check-cpu:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


BUILD/check-cpu:
  Auto merged

BUILD/check-cpu:
  make comparison a little more compatible with less exotic shells

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


BUILD/check-cpu:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


BUILD/check-cpu:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701


BUILD/check-cpu:
  Auto merged

  merging


mysql-test/t/mysqlbinlog-cp932.test:
  merging

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

into  trift2.:/MySQL/M51/test-help-5.1


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged

into  trift2.:/MySQL/M51/test-help-5.1

into  trift2.:/MySQL/M50/test-help-5.0


mysql-test/t/help.test:
  Auto merged
mysql-test/r/help.result:
  Manual merge:
  5.0 has warnings "Field 'url' doesn't have a default value" which 4.1 doesn't have.

Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.


mysql-test/r/help.result:
  Fix the result file according to the changed ID values in "help.test".
mysql-test/t/help.test:
  Now that (at least in 5.0) the system tables are filled with real data,
  inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
  like it should already have done in customer installations.
  
  Shift the ID values up into a high area where they will not conflict,
  also make the distinct for the different kinds of values (= unique throughout the test).
  
  No change to the logic.

into  trift2.:/MySQL/M50/test-help-5.0

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.


mysql-test/t/help.test:
  Now that (at least in 5.0) the system tables are filled with real data,
  inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
  like it should already have done in customer installations.
  
  Shift the ID values up into a high area where they will not conflict,
  also make the distinct for the different kinds of values (= unique throughout the test).
  
  No change to the logic.

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build

  Corrected GPL to be version 2 only


client/echo.c:
  Corrected GPL to be version 2 only

into  trift2.:/MySQL/M51/push-5.1

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
  Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
  Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
  Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
  Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
  Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
  Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
  Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
  Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
  Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
  Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
  Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
  Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
  Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
  Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
  Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Auto merged
mysql-test/install_test_db.sh:
  SCCS merged

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

  No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"


scripts/make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"
VC++Files/libmysqld/libmysqld.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files
VC++Files/mysqldemb/mysqldemb.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files
VC++Files/mysys/mysys.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files
VC++Files/sql/mysqld.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files
VC++Files/vio/vio.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files

mysql-test/r/delayed.result:
  result fixed
mysql-test/r/merge.result:
  result fixed
mysql-test/t/delayed.test:
  moved here from merge.test
mysql-test/t/init_connect.test:
  test fixed as it created users, then stopped without deletion, what caused
  problems in consequent tests
mysql-test/t/merge.test:
  moved to delayed.test
mysql-test/t/mysqlbinlog-cp932.test:
  disabled in embedded server

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


netware/Makefile.am:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


netware/Makefile.am:
  Auto merged

netware/Makefile.am:
  use detected awk variant instead of using awk directly