BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
VC++Files/mysql.dsw:
  Remove reference to mysql_test_run_new
VC++Files/mysql.sln:
  Remove reference to mysql_test_run_new

and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).


BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Delete: mysql-test/init_db.sql
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Delete: mysql-test/my_create_tables.c
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Delete: mysql-test/my_manage.c
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Delete: mysql-test/my_manage.h
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Delete: mysql-test/mysql_test_run_new.c
mysql-test/mysql-test-run.sh:
  Remove code that uses old mysqltestmanager
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Delete: tools/Makefile.am
BitKeeper/deleted/.del-managertest1.nc~96a5c1c5c2d33085:
  Delete: tools/managertest1.nc
BitKeeper/deleted/.del-mysqlmanager-sample.pwd~712b89f01aaad84a:
  Delete: tools/mysqlmanager-sample.pwd
BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b:
  Delete: tools/mysqlmanager.c
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Delete: SSL/client-req.pem
BitKeeper/deleted/.del-run-client~e683192d4f3821e0:
  Delete: SSL/run-client
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Delete: SSL/server-req.pem
BitKeeper/deleted/.del-run-server~55426778bc206c48:
  Delete: SSL/run-server
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Delete: SSL/Makefile.am
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Delete: SSL/NOTES
BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9:
  Delete: client/mysqlmanager-pwgen.c
BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6:
  Delete: client/mysqlmanagerc.c
BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
  Delete: Docs/Books/algor.eps
BitKeeper/deleted/.del-bk.txt~ffd510fa9531f87c:
  Delete: Docs/bk.txt
BitKeeper/deleted/.del-algor.gif~72c40c3bad198f2f:
  Delete: Docs/Books/algor.gif
BitKeeper/deleted/.del-algor.txt~37d2b5c1290e3cfa:
  Delete: Docs/Books/algor.txt
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
  Delete: Docs/Books/dbi.eps
BitKeeper/deleted/.del-dbi.gif~8f6861147437298b:
  Delete: Docs/Books/dbi.gif
BitKeeper/deleted/.del-dbi.txt~f5cf3fe321168fd5:
  Delete: Docs/Books/dbi.txt
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
  Delete: Docs/Books/dubois.eps
BitKeeper/deleted/.del-dubois.gif~e02d361b13b1c4a4:
  Delete: Docs/Books/dubois.gif
BitKeeper/deleted/.del-dubois.txt~998581cf9040fcc:
  Delete: Docs/Books/dubois.txt
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
  Delete: Docs/Books/ecomm.eps
BitKeeper/deleted/.del-ecomm.gif~f9bce6949b171613:
  Delete: Docs/Books/ecomm.gif
BitKeeper/deleted/.del-ecomm.txt~27494674104ee9db:
  Delete: Docs/Books/ecomm.txt
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
  Delete: Docs/Books/in_21.eps
BitKeeper/deleted/.del-in_21.gif~4a0b14f6d76458a9:
  Delete: Docs/Books/in_21.gif
BitKeeper/deleted/.del-in_21.txt~448fb4b3d8c0b34e:
  Delete: Docs/Books/in_21.txt
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
  Delete: Docs/Books/manual.eps
BitKeeper/deleted/.del-manual.gif~657cf08119b1b3fc:
  Delete: Docs/Books/manual.gif
BitKeeper/deleted/.del-manual.txt~4702af61ea5e3c29:
  Delete: Docs/Books/manual.txt
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
  Delete: Docs/Books/msql.eps
BitKeeper/deleted/.del-msql.gif~72ea7c6d307b9108:
  Delete: Docs/Books/msql.gif
BitKeeper/deleted/.del-msql.txt~235ae568824f4073:
  Delete: Docs/Books/msql.txt
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
  Delete: Docs/Books/prof.eps
BitKeeper/deleted/.del-prof.gif~2fa8ed201d9d05fe:
  Delete: Docs/Books/prof.gif
BitKeeper/deleted/.del-prof.txt~9fc04ec3e5ce8361:
  Delete: Docs/Books/prof.txt
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
  Delete: Docs/Books/pthreads.eps
BitKeeper/deleted/.del-pthreads.gif~2d9460dec2577859:
  Delete: Docs/Books/pthreads.gif
BitKeeper/deleted/.del-pthreads.txt~fc9e17d021335a39:
  Delete: Docs/Books/pthreads.txt
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
  Delete: Docs/Books/realmen.eps
BitKeeper/deleted/.del-realmen.gif~86113e3b1fcbd597:
  Delete: Docs/Books/realmen.gif
BitKeeper/deleted/.del-realmen.txt~81c30565a8f06539:
  Delete: Docs/Books/realmen.txt
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
  Delete: Docs/Books/sql-99.eps
BitKeeper/deleted/.del-sql-99.gif~df369376884a5689:
  Delete: Docs/Books/sql-99.gif
BitKeeper/deleted/.del-sql-99.txt~eff316adac3dd5b8:
  Delete: Docs/Books/sql-99.txt
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt~6e5b88fe4217504d:
  Delete: Docs/Tutorial-MySQL-final.txt
BitKeeper/deleted/.del-mysql-01.gif~6f3f2e474b834ac6:
  Delete: Docs/MySQL-logos/mysql-01.gif
BitKeeper/deleted/.del-mysql-02.gif~5e03e2ffa6bd060f:
  Delete: Docs/MySQL-logos/mysql-02.gif
BitKeeper/deleted/.del-mysql-03.gif~a510e3599346cd5f:
  Delete: Docs/MySQL-logos/mysql-03.gif
BitKeeper/deleted/.del-mysql-04.gif~6c3fdc91da64574:
  Delete: Docs/MySQL-logos/mysql-04.gif
BitKeeper/deleted/.del-mysql-05.gif~230c28315136655:
  Delete: Docs/MySQL-logos/mysql-05.gif
BitKeeper/deleted/.del-mysql-06.gif~8bb16461fd45634e:
  Delete: Docs/MySQL-logos/mysql-06.gif
BitKeeper/deleted/.del-mysql-07.gif~b86f918998a2114e:
  Delete: Docs/MySQL-logos/mysql-07.gif
BitKeeper/deleted/.del-mysql-08.gif~50fb4d886f82e8bc:
  Delete: Docs/MySQL-logos/mysql-08.gif
BitKeeper/deleted/.del-mysql-09.gif~17604ce9d92cd94a:
  Delete: Docs/MySQL-logos/mysql-09.gif
BitKeeper/deleted/.del-mysql-10.gif~a8b5306c4d911f8e:
  Delete: Docs/MySQL-logos/mysql-10.gif
BitKeeper/deleted/.del-mysql-11.gif~8495404458978524:
  Delete: Docs/MySQL-logos/mysql-11.gif
BitKeeper/deleted/.del-mysql-12.gif~18d47c1ad5aef481:
  Delete: Docs/MySQL-logos/mysql-12.gif
BitKeeper/deleted/.del-mysql-13.gif~1ad2eedf58da3aaa:
  Delete: Docs/MySQL-logos/mysql-13.gif
BitKeeper/deleted/.del-mysql-14.gif~a11e7df8653ad1b1:
  Delete: Docs/MySQL-logos/mysql-14.gif
BitKeeper/deleted/.del-mysql-15.gif~64c998fdd6fc1ae1:
  Delete: Docs/MySQL-logos/mysql-15.gif
BitKeeper/deleted/.del-mysql-16.gif~6a6c86de2f85f0f5:
  Delete: Docs/MySQL-logos/mysql-16.gif
BitKeeper/deleted/.del-mysql-17.gif~b07962578d0952b1:
  Delete: Docs/MySQL-logos/mysql-17.gif
BitKeeper/deleted/.del-mysql_anim-01.gif~d27d4f0c1a2a6da9:
  Delete: Docs/MySQL-logos/mysql_anim-01.gif
BitKeeper/deleted/.del-mysql_anim-02.gif~476224d724007343:
  Delete: Docs/MySQL-logos/mysql_anim-02.gif
BitKeeper/deleted/.del-mysql_anim-03.gif~470dd9c9a8bd55fc:
  Delete: Docs/MySQL-logos/mysql_anim-03.gif
BitKeeper/deleted/.del-mysql_anim-04.gif~14f429c87c0c718:
  Delete: Docs/MySQL-logos/mysql_anim-04.gif
BitKeeper/deleted/.del-mysql_anim-05.gif~e63e7f003b77ad95:
  Delete: Docs/MySQL-logos/mysql_anim-05.gif
BitKeeper/deleted/.del-mysql_anim-06.gif~d9cffaf35d9d4719:
  Delete: Docs/MySQL-logos/mysql_anim-06.gif
BitKeeper/deleted/.del-mysql-compatible.jpg~56ecc684688a7382:
  Delete: Docs/MySQL-logos/mysql-compatible.jpg
BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e:
  Delete: Docs/Support/docbook-fixup.pl
BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a:
  Delete: Docs/Support/docbook-prefix.pl
BitKeeper/deleted/.del-docbook-split~be931c3922898d0:
  Delete: Docs/Support/docbook-split
BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9:
  Delete: Docs/Support/make-docbook
BitKeeper/deleted/.del-make-makefile~39fd454b487126e8:
  Delete: Docs/Support/make-makefile
BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec:
  Delete: Docs/Support/test-make-manual
BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a:
  Delete: Docs/Support/test-make-manual-de
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch~40d336454ecf98db:
  Delete: Docs/Support/trivial-makeinfo-4.0c.patch
BitKeeper/deleted/.del-xwf~76b97805d9146b80:
  Delete: Docs/Support/xwf
BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e:
  Delete: Docs/Support/colspec-fix.pl
Docs/generate-text-files.pl:
  Rename: Docs/Support/generate-text-files.pl -> Docs/generate-text-files.pl
BitKeeper/deleted/.del-.cvsignore~250f630140b90042:
  Delete: Docs/Support/.cvsignore
BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Delete: Docs/changelog-4.0.xml
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Delete: Docs/changelog-4.1.xml
BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Delete: Docs/changelog-5.0.xml
BitKeeper/deleted/.del-sp-implemented.txt~15f5c0033d848288:
  Delete: Docs/sp-implemented.txt
mysql-test/std_data/cacert.pem:
  Rename: SSL/cacert.pem -> mysql-test/std_data/cacert.pem
mysql-test/std_data/client-cert.pem:
  Rename: SSL/client-cert.pem -> mysql-test/std_data/client-cert.pem
mysql-test/std_data/client-key.pem:
  Rename: SSL/client-key.pem -> mysql-test/std_data/client-key.pem
mysql-test/std_data/server-cert.pem:
  Rename: SSL/server-cert.pem -> mysql-test/std_data/server-cert.pem
mysql-test/std_data/server-key.pem:
  Rename: SSL/server-key.pem -> mysql-test/std_data/server-key.pem
BitKeeper/etc/ignore:
  added client/mysql_upgrade
Docs/Makefile.am:
  Move generate-text-files.pl up a level, since it is the only Support file
Makefile.am:
  Remove tools and SSL directories
client/Makefile.am:
  Remove mysqltestmanager clients
configure.in:
  Remove old tools directory
mysql-test/Makefile.am:
  Don't need to copy .pem files any more, they're now in std_data.
scripts/make_binary_distribution.sh:
  Don't package up mysqltestmanager
support-files/mysql.spec.sh:
  Don't package mysqltestmanager

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/sql_parse.cc:
  Auto merged

into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_partition.cc:
  Auto merged

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750

into  mysql.com:/home/alexi/bugs/mysql-5.1-13683


mysql-test/r/insert.result:
  Null-merge
sql/sql_insert.cc:
  Null-merge

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged

Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already.


storage/csv/ha_tina.cc:
  Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already

into  shellback.:C:/mysql/my51-bug17368


sql/ha_partition.cc:
  Auto merged

Open and seek to end of data_file after rename 
Fix comment for when file does not need repair.
Set share->mapped_file to NULL always when it's been unmapped 
Add test to see that file can be used after repair


mysql-test/r/csv.result:
  Add more test to see that the table can be used after repair
mysql-test/t/csv.test:
  Add more test to see that the table can be used after repair
storage/csv/ha_tina.cc:
  Close share->data_file in before renaming in ha_tina::repair
  Open and seek to end after rename
  Fix comment for when file does not need repair.
  Set share->mapped_file to NULL always when it's been unmapped

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

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

ExtractValue didn't understand tag and attribute names
consisting of "tricky" national letters (e.g. latin accenter letters).
It happened because XPath lex parser recognized only basic
latin letter a..z ad a part of an identifier.

Fixed to recognize all letters by means of new "full ctype" which
was added recently.


mysql-test/r/xml.result:
  Adding test case
mysql-test/t/xml.test:
  Adding test case
sql/item_xmlfunc.cc:
  Using recently implemented "true" ctype functionality
      to treat all national letters as valid tag names,
      Only basic latin letters worked so far.
strings/ctype-simple.c:
  A bug fix: ctype is array of 257 elements,
      adding offset to address correct element.

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


client/mysqltest.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list"

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


Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql-common/client.c:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/type_bit.result:
  Auto merged
mysql-test/r/type_bit_innodb.result:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/field.cc:
  Resolve merge conflict

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

into  zim.(none):/home/brian/mysql/dep-5.1

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


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

BitKeeper/deleted/.del-BldLevel.cmd~d1a41ef0712190e1:
  Delete: os2/BldLevel.cmd
BitKeeper/deleted/.del-BldLevelInf.cmd~49e29c82b3527c4a:
  Delete: os2/BldLevelInf.cmd
BitKeeper/deleted/.del-BldLevel.RES~6701a23a4d0b0f33:
  Delete: os2/BldLevel.RES
BitKeeper/deleted/.del-BldLevel.rc~fdab305a1b550012:
  Delete: os2/BldLevel.rc
BitKeeper/deleted/.del-ChangeLog.os2~c473e6f17539eb4:
  Delete: os2/ChangeLog.os2
BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713:
  Delete: os2/Makefile.am
BitKeeper/deleted/.del-build-all.cmd~68479264bb9abe:
  Delete: os2/build-all.cmd
BitKeeper/deleted/.del-MySQL-Client.icc~1d41cb9ed34c28ce:
  Delete: os2/MySQL-Client.icc
BitKeeper/deleted/.del-mysql-inf.wis~fce577336b6bb0e:
  Delete: os2/mysql-inf.wis
BitKeeper/deleted/.del-mysqlalt.wis~409d76f4dfd1e4c4:
  Delete: os2/mysqlalt.wis
BitKeeper/deleted/.del-MySQL-Opt.icc~b9517e18e6cf6c05:
  Delete: os2/MySQL-Opt.icc
BitKeeper/deleted/.del-MySQL-Source.icc~edded3c3a5cf83b1:
  Delete: os2/MySQL-Source.icc
BitKeeper/deleted/.del-MySQL-Sql.icc~2ec2a87f4a096d31:
  Delete: os2/MySQL-Sql.icc
BitKeeper/deleted/.del-MySQL-Sql.irs~266e93e2c9003567:
  Delete: os2/MySQL-Sql.irs
BitKeeper/deleted/.del-MySQL-Util.icc~e6288097ceb9cbd2:
  Delete: os2/MySQL-Util.icc
BitKeeper/deleted/.del-MySQL-Util.irs~cc5eb078dbc0605c:
  Delete: os2/MySQL-Util.irs
BitKeeper/deleted/.del-mysql.wis~95ebdebeb470c823:
  Delete: os2/mysql.wis
BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1:
  Delete: os2/ReadMe.txt
BitKeeper/deleted/.del-rint.cmd~49a7df1e6a4214af:
  Delete: os2/rint.cmd
BitKeeper/deleted/.del-rint.obj~e6bbb137ffb2f3d1:
  Delete: os2/rint.obj
BitKeeper/deleted/.del-rint.s~82358ca146718a12:
  Delete: os2/rint.s
BitKeeper/deleted/.del-config.h~1e58e9b6b3735392:
  Delete: os2/include/config.h
BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f:
  Delete: os2/include/Makefile.am
BitKeeper/deleted/.del-pwd.h~b26f27954da3a1be:
  Delete: os2/include/pwd.h
BitKeeper/deleted/.del-sgtty.h~4321c310847cb55c:
  Delete: os2/include/sgtty.h
BitKeeper/deleted/.del-termio.h~b136a899c396cb69:
  Delete: os2/include/termio.h
BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c:
  Delete: os2/include/sys/Makefile.am
BitKeeper/deleted/.del-file.h~90a5c4f6c7dfb5a:
  Delete: os2/include/sys/file.h
BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b:
  Delete: include/config-os2.h
BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5:
  Delete: mysys/my_os2cond.c
BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a:
  Delete: mysys/my_os2dirsrch.c
BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0:
  Delete: mysys/my_os2dirsrch.h
BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd:
  Delete: mysys/my_os2dlfcn.c
BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87:
  Delete: mysys/my_os2dlfcn.h0
BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b:
  Delete: mysys/my_os2file64.c
BitKeeper/deleted/.del-my_os2mutex.c~79f7438bfde5132a:
  Delete: mysys/my_os2mutex.c
BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a:
  Delete: mysys/my_os2thread.c
BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea:
  Delete: mysys/my_os2tls.c
Makefile.am:
  Removed os2 reference
configure.in:
  Removed OS2 specific os2 files.
include/Makefile.am:
  Removed os2 specific config file.
include/my_global.h:
  Removed OS2 specific files.
mysys/Makefile.am:
  Removed OS2 specific files.

  No declarations after first expression in block


client/mysql_upgrade.c:
  No declarations after first expression in block

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/log.cc:
  Auto merged

into  big_geek.:C:/Work/mysql/mysql-5.1-test

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged