A better fix for bug#10025.

Fixed test case plus added new tests.

After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.

Type longtext still converts correctly to type longtext, as the extra
tests prove.


mysql-test/r/union.result:
  Fixed an earlier test case plus added two new tests.
mysql-test/t/union.test:
  Fixed an earlier test case plus added two new tests.

into  production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208


BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

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

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)


scripts/mysql_config.sh:
  Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>

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

  Added "test" RPM package
  Install all binaries "make install" would
make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)


scripts/make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
support-files/mysql.spec.sh:
  Removed the rest of the "bench" sub RPM, but added a new "test" sub
  RPM containing the "mysql-test" directory earlier in the "bench" sub
  RPM. The new sub RPM "Obsoltes" "mysql-bench" as well.
  
  Added the rest of the binaries that "make install" would install
  
    bin/ndb_print_backup_file
    bin/ndb_print_schema_file
    bin/ndb_print_sys_file
    sbin/ndb_cpcd

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


sql/mysql_priv.h:
  Auto merged

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1


client/mysqldump.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/ndb_multi.test:
  Manual merge

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

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


sql/mysql_priv.h:
  Auto merged

mysql-test/r/true.require:
  New BitKeeper file ``mysql-test/r/true.require''

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.c:
  Auto merged
BitKeeper/deleted/.del-udf_example.def:
  Delete: sql/udf_example.def
mysql-test/mysql-test-run.pl:
  Manual merge 5.0->5.1
sql/Makefile.am:
  Manual merge 5.0->5.1

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/disabled.def:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/ha_ndbcluster_binlog.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

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


configure.in:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
Docs/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged

include/mysql_com.h:
  Fix for Bug#20208 "Blobs greater than 8K are being truncated to 8K"
sql/filesort.cc:
  Added a missing break point.
sql/item.cc:
  Made a function of a block of code.
sql/item.h:
  Added function string_field_type()

mysql-test/mysql-test-run.pl:
  fixed path for udf_example.so when running testsuite on Windows
sql/CMakeLists.txt:
  Added missing udf_example
sql/Makefile.am:
  Added udf_example files for make dist
sql/udf_example.c:
  fix for Windows: Windows doesn't have socket.h and friends
  
  Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.
sql/udf_example.def:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def

into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl


BitKeeper/etc/ignore:
  auto-union

local file slipped into a previous commit, fixing ignore.


BitKeeper/etc/ignore:
  fixing a slip in previous bk citool invokation.

into  trift2.:/MySQL/M50/push-5.0

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().


sql/log_event.cc:
  Using move_field_offset() to move the field pointer. It is necessary
  for unpack() and pack() of BIT fields to operate correctly.
  Adding debug printouts.
sql/sql_class.cc:
  Using move_field_offset() to move the field pointer. It is necessary
  for unpack() and pack() of BIT fields to operate correctly.
  Adding debug printouts to packing of update rows event.

Docs/manual.chm:
  BitKeeper file /MySQL/M50/push-5.0/Docs/manual.chm

into  chilla.local:/home/mydev/mysql-5.0-toteam

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged

Fixed udf_example, so tests now can also run udf on win.


sql/udf_example.def:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.1-win/sql/udf_example.def
include/config-win.h:
  removed USE_32_BIT_TIME
include/my_time.h:
  Fixed size of my_time for Win64 (should be 64bit)
mysql-test/mysql-test-run.pl:
  Added windows paths for udf_example
sql/CMakeLists.txt:
  Added udf_example.dll
sql/udf_example.c:
  Windows doesn't know about socket.h and friends. Use winsock.h instead

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Manual merge 5.0->5.1
mysql-test/r/rpl_insert_id.result:
  Manual merge 5.0->5.1
mysql-test/r/rpl_stm_max_relay_size.result:
  Manual merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
  Manual merge 5.0->5.1

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


mysql-test/r/rpl_insert_id.result:
  Merge 4.1-5.0
mysql-test/r/rpl_max_relay_size.result:
  Merge 4.1-5.0
mysql-test/t/rpl_insert_id.test:
  Merge 4.1-5.0
mysql-test/t/rpl_max_relay_size.test:
  Merge 4.1-5.0