Merge with new VARCHAR code

configure.in:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
heap/hp_create.c:
  Auto merged
heap/hp_delete.c:
  Auto merged
heap/hp_hash.c:
  Auto merged
heap/hp_write.c:
  Auto merged
include/decimal.h:
  Auto merged
include/m_ctype.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_1general.result:
  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
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/endspace.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
strings/decimal.c:
  Auto merged
tests/client_test.c:
  Auto merged
mysql-test/r/bdb.result:
  Merge with VARCHAR code
mysql-test/r/heap.result:
  Merge with VARCHAR code
mysql-test/r/innodb.result:
  Merge with VARCHAR code
mysql-test/r/select.result.es:
  Merge with VARCHAR code
mysql-test/t/bdb.test:
  Merge with VARCHAR code
mysql-test/t/heap.test:
  Merge with VARCHAR code
mysql-test/t/innodb.test:
  Merge with VARCHAR code
sql/field.cc:
  Merge with VARCHAR code
sql/item.cc:
  Merge with VARCHAR code
sql/sql_acl.cc:
  Merge with VARCHAR code
sql/sql_parse.cc:
  Merge with VARCHAR code
sql/sql_table.cc:
  Merge with VARCHAR code
sql/sql_update.cc:
  Merge with VARCHAR code
sql/table.h:
  Merge with VARCHAR code
strings/ctype-mb.c:
  Don't pad my_like_range with max_str for simple LIKE expression
strings/ctype-tis620.c:
  Merge with VARCHAR code
strings/ctype-ucs2.c:
  Added new argument to my_strnncollsp_ucs2()
  Simply code

1 files changed, 34 insertions, 34 deletions

diff --git a/mysql-test/r/ctype_tis620.result b/mysql-test/r/ctype_tis620.result
index fa99c2d1318..0f29c564fa8 100644
--- a/mysql-test/r/ctype_tis620.result
+++ b/mysql-test/r/ctype_tis620.result
@@ -259,8 +259,8 @@ WU
 ¡Ñ³°ªÒ
 ¡Ñ³°Ô¡Ò
 ¡Ñ³·ÔÁÒ
-¡Ñ¹µì
 ¡Ñ¹µÔ¡Ã
+¡Ñ¹µì
 ¡Ñ¹¸ÔªÒ
 ¡Ñ¹¸ÔÁÒ
 ¡Ñ¹ÂÒÃѵ¹ì
@@ -272,8 +272,8 @@ WU
 ¡Ò­¨¹ÇÃó
 ¡Ò­¨¹Ò
 ¡Ò¹´Ò
-¡Ò¹µì
 ¡Ò¹µìÃÇÕ
+¡Ò¹µì
 ¡ÒÂÊÔ·¸Ôì
 ¡ÒÃÇÔÍÃ
 ¡ÒÃسÕ
@@ -350,8 +350,8 @@ WU
 à¡ÕÂõÔÈÑ¡´Ôì
 à¡ÕÂõÔÊÇÑÊ´Ôì
 à¡×éÍ¡ÙÅ
-á¡éÇ
 á¡éÇã¨
+á¡éÇ
 â¡Ážѹ¸ì
 â¡àÁÈ
 â¡ÅºÍÅ ¤Í¹à¹ç¤ªÑè¹Êì
@@ -368,8 +368,8 @@ WU
 ¢¨Ãà¡ÕÂõÔ
 ¢¨ÃÈÃÕ
 ¢¨ÃÈÑ¡´Ôì
-¢¹ÔÉ°ì
 ¢¹ÔÉ°Ò
+¢¹ÔÉ°ì
 ¢ÇÑ­ã¨
 ¢ÇÑ­ªÑÂ
 ¢ÇÑ­à´×͹
@@ -412,8 +412,8 @@ WU
 ठÊËÒÂÍÔÁà»ê¡«ì
 à¤.«Õ.¾Õ. áÁªªÕ¹à¹ÍÃÕè
 षշÕÅÔÊ«Ôè§
-ह áÁ¡«ì (»ÃÐà·Èä·Â)
 ह áÁç¡«ì (»ÃÐà·Èä·Â)
+ह áÁ¡«ì (»ÃÐà·Èä·Â)
 à¤Ã×ÍÇÑÅÂì
 ᤹¹Ù ÍÔ¹àµÍÃìà·Ã´
 á¤Ð¨éÍÂ
@@ -494,12 +494,12 @@ WU
 ¨ÓàÃÔ­
 ¨ÓÅͧ
 ¨Ô³³ì
-¨Ôµµì
 ¨Ôµµì¹ÔÉÒ
 ¨ÔµµÁÒÊ
 ¨ÔµµÒ
 ¨ÔµµÔ
 ¨ÔµµÔ¹¹Ñ¹·ì
+¨Ôµµì
 ¨ÔµÃÅ´Ò
 ¨ÔµÃÒ
 ¨ÔµÃÒÀóì
@@ -627,10 +627,10 @@ WU
 ªÇ¹¾ÔÈ
 ªÇÅÔµ
 ªÇÔÈÒ
-ªèÍ
 ªèͩѵÃ
 ªèÍ·Ô¾Âì
 ªèÍÍÑ­ªÑ­
+ªèÍ
 ªÐ¹ÔÅ
 ªÐÍé͹
 ªÑªªÑÂ
@@ -758,12 +758,12 @@ WU
 ³¸ÔµÒ
 ³ÀÑ·Ã
 ³Àѷáóì
-³Ã§¤ì
 ³Ã§¤ìªÑÂ
 ³Ã§¤ì¾ÑªÃì
 ³Ã§¤ìÄ·¸Ôì
 ³Ã§¤ìÇÔ·Âì
 ³Ã§¤ìÈÑ¡´Ôì
+³Ã§¤ì
 ³Ã§ÃÑ¡Éì
 ³Ã§Ä·¸Ôì
 ³Ã§ÈÑ¡´Ôì
@@ -862,11 +862,11 @@ WU
 µÐÇѹ
 µÑ觨Ñè§ËÅÍ´ä¿
 µÒà¿ç´
-µØê
 µØ꡵Ò
 µØéÁ
 µØëÂ
 µØÅÒÅѡɳì
+µØê
 àµçÁà´ª
 àµ×͹ã¨
 àµ×͹µÒ
@@ -917,8 +917,8 @@ WU
 ·Ñº·ÔÁ
 ·ÑȹÇÃó
 ·ÑȹվÃ
-·ÑȹÕÂì
 ·ÑȹÕÂÒ
+·ÑȹÕÂì
 ·ÑÈÇÃó
 ·èÒ·ÃÒÂá¨é§ÇѲ¹Ò
 ·Ô¦ÑÁ¾Ã
@@ -1088,8 +1088,8 @@ WU
 ¹Ã¾Å
 ¹ÃÀÑ·Ãì
 ¹ÃÒ
-¹ÃÔ¹·Ãì
 ¹ÃÔ¹·Ãìà´ª
+¹ÃÔ¹·Ãì
 ¹ÃÔÈ
 ¹ÃÔÉ°
 ¹ÃÕ
@@ -1115,8 +1115,8 @@ WU
 ¹Ñ·¸Á¹
 ¹Ñ¹ªÑÂ
 ¹Ñ¹·ªÑÂ
-¹Ñ¹·¹ì
 ¹Ñ¹·¹Ò
+¹Ñ¹·¹ì
 ¹Ñ¹·¾Ã
 ¹Ñ¹·¾Å
 ¹Ñ¹·ÁÒÊ
@@ -1148,14 +1148,14 @@ WU
 ¹Ôà«Ð
 ¹Ô´
 ¹Ô´Ò
-¹ÔµÂì
 ¹ÔµÂÒ
+¹ÔµÂì
 ¹ÔµÔ
 ¹ÔµÔ¾§Éì
 ¹ÔµÔÁÒ
 ¹Ô·ÃÒ
-¹Ô·Ñȹì
 ¹Ô·ÑȹÕÂì
+¹Ô·Ñȹì
 ¹Ô¸ÔÇ´Õ
 ¹Ô»»Í¹à¾¹µì(»ÃÐà·Èä·Â)
 ¹Ô¾¹¸ì
@@ -1349,8 +1349,8 @@ WU
 »ÃÒ³ÕÂì
 »ÃÒâÁ·Âì
 »ÃÒö¹Ò
-»ÃÔ­­ì
 »ÃÔ­­Ò
+»ÃÔ­­ì
 »ÃÔ­´Ò
 »ÃÔ³´Ò
 »ÃÔ·ÑÈ
@@ -1454,10 +1454,10 @@ WU
 ¾§ÉìÈÑ¡´Ôì
 ¾§ÉìÊѹµì
 ¾§Éì͹ѹµì
-¾¨¹ì
 ¾¨¹Ò
 ¾¨¹Òö
 ¾¨¹ÕÂì
+¾¨¹ì
 ¾¨ÁÒ¹
 ¾¨ÁÒÅÂì
 ¾¹Á
@@ -1504,8 +1504,8 @@ WU
 ¾ÃÊÇÃäì
 ¾ÃËÁ¾Ñ²¹ì
 ¾ÃéÍÁªÑÂ
-¾ÃлÃÐá´§ Î͹´éÒ¤ÒÃìÊì
 ¾ÃлÃÐá´§ Î͹´éÒ¤ÒÃìÊì ¨Ó¡Ñ´
+¾ÃлÃÐá´§ Î͹´éÒ¤ÒÃìÊì
 ¾ÃÐÃÒÁ 3 ¤ÒÃìà«ç¹àµÍÃì
 ¾ÃÐÃÒÁ 3 Î͹´éÒ¤ÒÃìÊì
 ¾ÃÔéÁà¾ÃÒ
@@ -1604,10 +1604,10 @@ WU
 ¾Ùŷͧ¾Ãç;à¾ÍÃìµÕé_
 ¾ÙżÅ
 à¾ç§ ¿Ù ËÅÔ¹
-à¾çªÃì
 ྪÃÃѵ¹ì
 ྪÃÅ´Ò
 ྪÃÔ¹·Ãì
+à¾çªÃì
 à¾ç­¨Ñ¹·Ãì
 à¾ç­·Ô¾Âì
 à¾ç­¹ÀÒ
@@ -1831,7 +1831,6 @@ WU
 ÃÒàÁÈÃì
 ÃÒÂÕ¹
 Ã×è¹ÇÃÒËì
-ÃØé§
 ÃØ觷ԾÂì
 ÃØ觷ÔÇÒ
 ÃØ觹ÀÒ
@@ -1840,11 +1839,12 @@ WU
 ÃØè§Ãѵ¹ì
 ÃØè§ÃÑÈÁÕ
 ÃØè§àÃ×ͧ
-ÃØè§âè¹ì
 ÃØè§âè¹ì¢¹Êè§
+ÃØè§âè¹ì
 ÃØé§ÅÒÇÃó
 ÃØè§ÇÔ·Âì
 ÃØè§ÍÃس
+ÃØé§
 ÃبÒ
 ÃبÒÀÒ
 ÃØËйÒ
@@ -1861,8 +1861,8 @@ WU
 áþᾤ ¤Í¹ÊµÃѤªÑè¹
 âç§Ò¹àËÅç¡¡Ãا෾Ï
 âè¹ì»ÃÐàÊÃÔ°
-Ä·¸Ôì
 Ä·¸ÔªÑÂ
+Ä·¸Ôì
 ÅÅÔ´Ò
 ÅÅÔµÒ
 ÅÐÁèÍÁ
@@ -2050,8 +2050,8 @@ WU
 ÇÔäÅÇÃó
 ÇÔÇ
 ÇÔÇÃø¹ì
-ÇÔÇѲ¹ì
 ÇÔÇѲ¹ìªÑÂ
+ÇÔÇѲ¹ì
 ÇÔȹÕ
 ÇÔÈÃص
 ÇÔÈÒÅ
@@ -2146,11 +2146,11 @@ WU
 ÈÈÔÇÔÁÅ
 ÈÈÔÉÒ
 ÈÑ¡´Ò
-ÈÑ¡´Ôì
 ÈÑ¡´ÔìªÑÂ
 ÈÑ¡´ÔìàªÇ§
 ÈÑ¡´Ôì´Ò
 ÈÑ¡´ÔìÇÔºÙÅÂì
+ÈÑ¡´Ôì
 ÈÑ¡ÃÔ¹·Ãì
 ÈѹʹÕÂì
 ÈÒ¹µÔᏴì
@@ -2348,18 +2348,18 @@ WU
 ÊÓÃÒ­
 ÊÓÄ·¸Ôì
 ÊÓÅÕ
-ÊÔ§Ëì
 ÊÔ§Ëì¾Å
 ÊÔ§ËÒ
+ÊÔ§Ëì
 ÊԵҹѹ
 ÊÔµÒ¾Ã
 ÊÔ·¸Ò
-ÊÔ·¸Ôì
 ÊÔ·¸ÔªÑÂ
 ÊÔ·¸Ôà´ª
 ÊÔ·¸Ô¾Ã
 ÊÔ·¸Ô¾Ãó
 ÊÔ·¸Ô¾Å
+ÊÔ·¸Ôì
 ÊÔ¹·ÇÕ
 ÊÔÃÔªÑÂ
 ÊÔÃÔà´ª
@@ -2393,15 +2393,15 @@ WU
 ÊØ¢ÊÇÑÊ´Ôì¡Å¡ÒÃ
 ÊØ¢Êѹµì
 ÊØ¢ØÁ
-Êؤ¹¸ì
 Êؤ¹¸Ò
+Êؤ¹¸ì
 ÊبÒÃÕ
 ÊبԵ
 ÊبԵµÒ
 ÊبԵÃÒ
 ÊبԹ´Ò
-ÊبԹµì
 ÊبԹµ¹ì
+ÊبԹµì
 ÊتÅ
 ÊتÑÂ
 ÊتҴÒ
@@ -2443,13 +2443,13 @@ WU
 ÊظԴÒ
 ÊظÔÈÑ¡´Ôì
 ÊظÕ
-ÊظÕÃì
 ÊظÕÃÒ
+ÊظÕÃì
 Êع·Ã
 Êع·ÃÕ
 Êعѷ·Õ
-Êعѹ·ì
 Êعѹ·Ò
+Êعѹ·ì
 ÊعԵÒ
 ÊعÔÈÒ
 ÊعÔÉÒ
@@ -2511,10 +2511,10 @@ WU
 ÊØÃÈÑ¡´Ôì
 ÊØÃÊÔ·¸Ôì
 ÊØÃѪ¹Õ¡Ã
-ÊØÃѵ¹ì
 ÊØÃѵ¹Ç´Õ
 ÊØÃѵ¹ìÇ´Õ
 ÊØÃѵ¹Ò
+ÊØÃѵ¹ì
 ÊØÃѵÂÒ
 ÊØÃÒ§¤¹Ò
 ÊØÃÔªÑÂ
@@ -2529,8 +2529,8 @@ WU
 ÊØÃÕ¸Ò¾Ã
 ÊØÃÕ¾Ã
 ÊØÃÕÁÒÈ
-ÊØÃÕÂì
 ÊØÃÕÂì¾Ã
+ÊØÃÕÂì
 ÊØÃÕÃѵ¹ì
 ÊØÅÑ´´Ò
 ÊØÇÀÑ·Ãì
@@ -2540,9 +2540,9 @@ WU
 ÊØÇÃóÕ
 ÊØÇÃóÕÂì
 ÊØÇÃѵ¹ì
-ÊØÇѲ¹ì
 ÊØÇѲ¹ìªÑÂ
 ÊØÇѲ¹Ò
+ÊØÇѲ¹ì
 ÊØÇѵªÑÂ
 ÊØÇÒÃÕ
 ÊØÇÔªÑÂ
@@ -2623,8 +2623,8 @@ WU
 ͹¹·ì
 ͹ÇѪ
 ͹ѭ­Ò
-͹ѹµì
 ͹ѹµÈÑ¡´Ôì
+͹ѹµì
 ͹ءԵÔ
 ͹ءÙÅ
 ͹تÒ
@@ -2770,8 +2770,8 @@ WU
 ÍÒÃÒ¾Ã
 ÍÒÃÔÂÒ
 ÍÒÃÕ
-ÍÒÃÕÂì
 ÍÒÃÕÂì  àÊÁÒ©ÔÁ  (ä·Âູ¡Ñ¹
+ÍÒÃÕÂì
 ÍÒÃÕÃѵ¹ì
 ÍÒÃÕÇÃó
 ÍÓ¹ÇÂ