bzr push into mysql-trunk branch (tor.didriksen:3630 to 3631)

[Tor Didriksen]

 3631 Tor Didriksen	2011-02-10
      cmake build is broken, test-bt-xxx are gone

    modified:
      mysql-test/CMakeLists.txt
 3630 Alexander Barkov	2011-02-10 [merge]
      Merging from 5.5

    modified:
      mysql-test/include/ctype_numconv.inc
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
=== modified file 'mysql-test/CMakeLists.txt'
--- a/mysql-test/CMakeLists.txt	2010-11-14 18:09:32 +0000
+++ b/mysql-test/CMakeLists.txt	2011-02-10 09:00:17 +0000
@@ -93,7 +93,7 @@ ADD_CUSTOM_TARGET(test-force
   COMMAND perl ./mysql-test-run.pl --force ${EXP}
 )
 
-FOREACH(collection test-bt test-bt-fast test-bt-debug)
+FOREACH(collection)
   IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/collections/${collection})
     MESSAGE(FATAL_ERROR 
       "${CMAKE_CURRENT_SOURCE_DIR}/collections/${collection} does not exist")

No bundle (reason: useless for push emails).