bzr commit into mysql-next-mr-wl4816 branch (marc.alff:3207)

[Marc Alff]

#At file:///Users/malff/BZR_TREE/mysql-next-mr-wl4816/ based on revid:marc.alff@stripped

 3207 Marc Alff	2010-11-10 [merge]
      Merge mysql-next-mr --> mysql-next-mr-wl4816

    added:
      mysql-test/r/ctype_utf8mb4_uca.result
      mysql-test/r/gis-precise.result
      mysql-test/r/gis-rt-precise.result
      mysql-test/t/ctype_utf8mb4_uca.test
      mysql-test/t/gis-precise.test
      mysql-test/t/gis-rt-precise.test
      sql/gcalc_slicescan.cc
      sql/gcalc_slicescan.h
      sql/gcalc_tools.cc
      sql/gcalc_tools.h
      sql/plistsort.c
    modified:
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      mysql-test/include/ctype_unicode_latin.inc
      mysql-test/r/archive_gis.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_uca.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf16_uca.result
      mysql-test/r/ctype_utf32_uca.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/gis-rtree.result
      mysql-test/r/gis.result
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/t/ctype_uca.test
      mysql-test/t/ctype_utf16_uca.test
      mysql-test/t/ctype_utf32_uca.test
      mysql-test/t/gis.test
      mysys/charset-def.c
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/item_create.cc
      sql/item_geofunc.cc
      sql/item_geofunc.h
      sql/spatial.cc
      sql/spatial.h
      sql/sql_insert.cc
      sql/sql_string.h
      sql/sql_yacc.yy
      strings/ctype-uca.c

Diff too large for email (12231 lines, the limit is 10000).
No bundle (reason: revision is a merge).