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

libmysqld/cmakelists.txt:
  added generated flag to sql_yacc.cc and sql_yacc.h

  Disabled randomly failing tests


mysql-test/t/disabled.def:
  Disabled randomly failing tests

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

into mysql.com:/home/gluh/MySQL/Merge/5.1-new

into mysql.com:/home/gluh/MySQL/Merge/5.1-new

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

into mysql.com:/home/hf/work/mysql-5.1.upgrd

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


mysql-test/r/innodb.result:
  Null-merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto-merge

into  mysql.com:/usr/local/mysql/mysql-5.0-tmp

into  mysql.com:/home/alexi/bugs/mysql-5.0-15868-work

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