Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/my/mysql-4.1

BUILD/compile-dist

@@ -43,5 +43,6 @@ fi
   --with-berkeley-db \
   --with-innodb \
   --enable-thread-safe-client \
+  --with-extra-charsets=complex \
   --with-ndbcluster
 make

Build-tools/Do-pkg

@@ -31,6 +31,7 @@ $opt_help= undef;
 $opt_log= undef;
 $opt_mail= "";
 $opt_skip_dmg= undef;
+$opt_skip_prefpane= undef;
 $opt_skip_si= undef;
 $opt_suffix= undef;
 $opt_verbose= undef;
@@ -41,6 +42,7 @@ GetOptions(
 	"help|h",
 	"log|l:s",
 	"mail|m=s",
+	"skip-prefpane|p",
 	"skip-dmg|skip-disk-image|s",
 	"skip-si|skip-startup-item",
 	"suffix=s",
@@ -82,6 +84,7 @@ $HOST=~ /^([^.-]*)/;
 $HOST= $1;
 $LOGFILE= "$PWD/Logs/$HOST-$MAJOR.$MINOR$SUFFIX.log";
 $BUILDDIR= "$PWD/$HOST";
+$PREFPANE= "$PWD/mysql-administrator/source/mac/PreferencePane/build/MySQL.prefPane";
 $SRCBASEDIR= <$BUILDDIR/mysql*-$VERSION>;
 $SUPFILEDIR= <$SRCBASEDIR/support-files/MacOSX>;
 $TAR= <$BUILDDIR/$NAME-apple-darwin*-powerpc.tar.gz>;
@@ -219,6 +222,19 @@ unless ($opt_skip_si)
 	&run_command($command, "Error while building package $SI_NAME.pkg!");
 }
 
+#
+# Include the MySQL Preference Pane
+#
+unless ($opt_skip_prefpane)
+{
+	&abort("Could not find PrefPane helper application. Did you compile and install it?")
+		unless (-f "$PREFPANE/Contents/Resources/mahelper");
+	&logger("Including $PREFPANE in $PKGDEST");
+	&run_command("mkdir $PKGDEST/MySQL.prefPane", "Could not create $PKGDEST/MySQL.prefPane!");
+	&run_command("ditto $PREFPANE $PKGDEST/MySQL.prefPane", "Could not copy $PREFPANE into $PKGDEST!");
+	&run_command("chown -R root:wheel $PKGDEST/MySQL.prefPane", "Cannot chown $PKGDEST/MySQL.prefPane!");
+}
+
 if ($opt_skip_dmg)
 {
 	&logger("SUCCESS: Package $PKGDEST/$NAME.pkg created");
@@ -254,6 +270,7 @@ chomp($mountpoint=`mount | grep "\/Volumes\/$NAME" | cut -f3 -d" "`) if (!$opt_d
 &logger("Copying $PKGDEST/$NAME.pkg to Disk image /Volumes/$NAME");
 &run_command("ditto $PKGDEST /Volumes/$NAME", "Could not copy $PKGDEST to /Volumes/$NAME!");
 &run_command("ditto $SUPFILEDIR/ReadMe.txt /Volumes/$NAME", "Could not copy $SPFILEDIR/ReadMe.txt to /Volumes/$NAME!");
+&run_command("chown root:wheel /Volumes/$NAME/ReadMe.txt", "Could not fix ownerships of /Volumes/$NAME/ReadMe.txt!");
 chomp($mountpoint=`mount | grep "\/Volumes\/$NAME" | cut -f1 -d" "`) if (!$opt_dry_run);
 &abort("/Volumes/$NAME not attached!") if (!$mountpoint && !$opt_dry_run);
 &logger("Unmounting $mountpoint");
@@ -302,6 +319,7 @@ Options:
                                      if logging is enabled)
                                      Note that the \@-Sign needs to be quoted!
                                      Example: --mail=user\\\@domain.com
+-p, --skip-prefpane                  Skip including the PreferencePane
 -s, --skip-disk-image, --skip-dmg    Just build the PKGs, don't put it into a
                                      disk image afterwards
     --skip-startup-item, --skip-si   Skip the creation of the StartupItem PKG

client/completion_hash.cc

@@ -79,7 +79,8 @@ int completion_hash_update(HashTable *ht, char *arKey, uint nKeyLength,
       if (!memcmp(p->arKey, arKey, nKeyLength)) {
 	entry *n;
 
-	n = (entry *) alloc_root(&ht->mem_root,sizeof(entry));
+	if (!(n = (entry *) alloc_root(&ht->mem_root,sizeof(entry))))
+          return FAILURE;
 	n->pNext = p->pData;
 	n->str = str;
 	p->pData = n;

client/mysql.cc

@@ -1502,7 +1502,10 @@ You can turn off this feature to get a quicker startup with -A\n\n");
       if (!(field_names[i] = (char **) alloc_root(&hash_mem_root,
 						  sizeof(char *) *
 						  (num_fields*2+1))))
-	break;
+      {
+        mysql_free_result(fields);
+        break;
+      }
       field_names[i][num_fields*2]= '\0';
       j=0;
       while ((sql_field=mysql_fetch_field(fields)))
@@ -2077,10 +2080,10 @@ print_table_data_html(MYSQL_RES *result)
   }
   while ((cur = mysql_fetch_row(result)))
   {
+    ulong *lengths=mysql_fetch_lengths(result);
     (void) tee_fputs("<TR>", PAGER);
     for (uint i=0; i < mysql_num_fields(result); i++)
     {
-      ulong *lengths=mysql_fetch_lengths(result);
       (void) tee_fputs("<TD>", PAGER);
       safe_put_field(cur[i],lengths[i]);
       (void) tee_fputs("</TD>", PAGER);
@@ -2106,10 +2109,10 @@ print_table_data_xml(MYSQL_RES *result)
   fields = mysql_fetch_fields(result);
   while ((cur = mysql_fetch_row(result)))
   {
+    ulong *lengths=mysql_fetch_lengths(result);
     (void) tee_fputs("\n  <row>\n", PAGER);
     for (uint i=0; i < mysql_num_fields(result); i++)
     {
-      ulong *lengths=mysql_fetch_lengths(result);
       tee_fprintf(PAGER, "\t<%s>", (fields[i].name ?
 				  (fields[i].name[0] ? fields[i].name :
 				   " &nbsp; ") : "NULL"));

client/mysqladmin.cc

@@ -33,7 +33,8 @@
 #define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */
 #define MAX_TRUNC_LENGTH 3
 
-char *host= NULL, *user= 0, *opt_password= 0;
+char *host= NULL, *user= 0, *opt_password= 0,
+     *default_charset= NULL;
 char truncated_var_names[MAX_MYSQL_VAR][MAX_TRUNC_LENGTH];
 char ex_var_names[MAX_MYSQL_VAR][FN_REFLEN];
 ulonglong last_values[MAX_MYSQL_VAR];
@@ -145,6 +146,9 @@ static struct my_option my_long_options[] =
   {"character-sets-dir", OPT_CHARSETS_DIR,
    "Directory where character sets are.", (gptr*) &charsets_dir,
    (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"default-character-set", OPT_DEFAULT_CHARSET,
+   "Set the default character set.", (gptr*) &default_charset,
+   (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
   {"host", 'h', "Connect to host.", (gptr*) &host, (gptr*) &host, 0, GET_STR,
@@ -343,6 +347,8 @@ int main(int argc,char *argv[])
   if (shared_memory_base_name)
     mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
 #endif
+  if (default_charset)
+    mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, default_charset);
   if (sql_connect(&mysql, option_wait))
   {
     unsigned int err= mysql_errno(&mysql);
@@ -826,13 +832,39 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
       if (argv[1][0])
       {
         char *pw= argv[1];
+        bool old= find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD;
 #ifdef __WIN__
         uint pw_len= strlen(pw);
         if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'')
           printf("Warning: single quotes were not trimmed from the password by"
                  " your command\nline client, as you might have expected.\n");
 #endif
-        if (find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD)
+        /*
+           If we don't already know to use an old-style password, see what
+           the server is using
+        */
+        if (!old) {
+          if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'")) {
+            my_printf_error(0, "Could not determine old_passwords setting from server; error: '%s'",
+                	    MYF(ME_BELL),mysql_error(mysql));
+            return -1;
+          } else {
+            MYSQL_RES *res= mysql_store_result(mysql);
+            if (!res) {
+              my_printf_error(0, "Could not get old_passwords setting from server; error: '%s'",
+        		      MYF(ME_BELL),mysql_error(mysql));
+              return -1;
+            }
+            if (!mysql_num_rows(res)) {
+              old= 1;
+            } else {
+              MYSQL_ROW row= mysql_fetch_row(res);
+              old= !strncmp(row[1], "ON", 2);
+            }
+            mysql_free_result(res);
+          }
+        }
+        if (old)
           make_scrambled_password_323(crypted_pw, pw);
         else
           make_scrambled_password(crypted_pw, pw);

client/mysqldump.c

@@ -106,7 +106,14 @@ FILE  *md_result_file;
 static char *shared_memory_base_name=0;
 #endif
 static uint opt_protocol= 0;
-static char *default_charset= (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET;
+/*
+  Constant for detection of default value of default_charset.
+  If default_charset is equal to mysql_universal_client_charset, then
+  it is the default value which assigned at the very beginning of main().
+*/
+static const char *mysql_universal_client_charset=
+  MYSQL_UNIVERSAL_CLIENT_CHARSET;
+static char *default_charset;
 static CHARSET_INFO *charset_info= &my_charset_latin1;
 const char *default_dbug_option="d:t:o,/tmp/mysqldump.trace";
 
@@ -678,7 +685,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
         Set charset to the default compiled value if it hasn't
         been reset yet by --default-character-set=xxx.
       */
-      if (default_charset == (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET)
+      if (default_charset == mysql_universal_client_charset)
         default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;
       break;
     }
@@ -2403,6 +2410,7 @@ cleanup:
 int main(int argc, char **argv)
 {
   compatible_mode_normal_str[0]= 0;
+  default_charset= (char *)mysql_universal_client_charset;
 
   MY_INIT(argv[0]);
   if (get_options(&argc, &argv))

cmd-line-utils/libedit/makelist.sh

@@ -145,7 +145,7 @@ case $FLAG in
 #
 -fh)
     cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
-    sort | tr '[a-z]' '[A-Z]' | $AWK '
+    sort | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | $AWK '
 	BEGIN {
 	    printf("/* Automatically generated file, do not edit */\n");
 	    printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");

cmd-line-utils/libedit/parse.c

@@ -87,7 +87,8 @@ parse_line(EditLine *el, const char *line)
 	int argc;
 	Tokenizer *tok;
 
-	tok = tok_init(NULL);
+	if (!(tok = tok_init(NULL)))
+          return -1;
 	tok_line(tok, line, &argc, &argv);
 	argc = el_parse(el, argc, argv);
 	tok_end(tok);

configure.in

@@ -1924,7 +1924,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \
   pthread_key_delete pthread_rwlock_rdlock pthread_setprio \
   pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \
   realpath rename rint rwlock_init setupterm \
-  shmget shmat shmdt shmctl \
+  shmget shmat shmdt shmctl sigaction \
   sighold sigset sigthreadmask \
   snprintf socket stpcpy strcasecmp strerror strnlen strpbrk strstr strtol \
   strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr)
@@ -3097,7 +3097,8 @@ ndb_transporter_opt_objs=""
 if test "$ac_cv_func_shmget" = "yes" &&
    test "$ac_cv_func_shmat" = "yes" &&
    test "$ac_cv_func_shmdt" = "yes" &&
-   test "$ac_cv_func_shmctl" = "yes"
+   test "$ac_cv_func_shmctl" = "yes" &&
+   test "$ac_cv_func_sigaction" = "yes"
 then
    AC_DEFINE([NDB_SHM_TRANSPORTER], [1],
              [Including Ndb Cluster DB shared memory transporter])

include/my_pthread.h

@@ -631,6 +631,7 @@ extern int pthread_dummy(int);
 /* All thread specific variables are in the following struct */
 
 #define THREAD_NAME_SIZE 10
+#ifndef DEFAULT_THREAD_STACK
 #if defined(__ia64__)
 /*
   MySQL can survive with 32K, but some glibc libraries require > 128K stack
@@ -640,6 +641,7 @@ extern int pthread_dummy(int);
 #else
 #define DEFAULT_THREAD_STACK	(192*1024)
 #endif
+#endif
 
 struct st_my_thread_var
 {

mysql-test/mysql-test-run.sh

@@ -239,11 +239,12 @@ MYSQL_TEST_SSL_OPTS=""
 USE_TIMER=""
 USE_EMBEDDED_SERVER=""
 RESULT_EXT=""
+TEST_MODE="default"
 
 while test $# -gt 0; do
   case "$1" in
-    --embedded-server) USE_EMBEDDED_SERVER=1 ; USE_MANAGER=0 ; NO_SLAVE=1 ; \
-      USE_RUNNING_SERVER="" RESULT_EXT=".es" ;;
+    --embedded-server) USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 ; \
+      USE_RUNNING_SERVER="" RESULT_EXT=".es" TEST_MODE="embedded" ;;
     --user=*) DBUSER=`$ECHO "$1" | $SED -e "s;--user=;;"` ;;
     --force)  FORCE=1 ;;
     --timer)  USE_TIMER=1 ;;
@@ -323,7 +324,7 @@ while test $# -gt 0; do
       SLEEP_TIME_AFTER_RESTART=`$ECHO "$1" | $SED -e "s;--sleep=;;"`
       ;;
     --ps-protocol)
-      EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;;
+      TEST_MODE="ps-protocol" EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;;
     --user-test=*)
       USER_TEST=`$ECHO "$1" | $SED -e "s;--user-test=;;"`
       ;;
@@ -1561,7 +1562,7 @@ run_testcase ()
 	show_failed_diff $tname
 	$ECHO
 	if [ x$FORCE != x1 ] ; then
-	 $ECHO "Aborting: $tname failed. To continue, re-run with '--force'."
+	 $ECHO "Aborting: $tname failed in $TEST_MODE mode. To continue, re-run with '--force'."
 	 $ECHO
          if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && \
 	    [ -z "$DO_DDD" ] && [ -z "$USE_EMBEDDED_SERVER" ]
@@ -1742,7 +1743,7 @@ $ECHO
 [ "$DO_GPROF" ] && gprof_collect # collect coverage information
 
 if [ $TOT_FAIL -ne 0 ]; then
-  $ECHO "mysql-test-run: *** Failing the test(s):$FAILED_CASES"
+  $ECHO "mysql-test-run in $TEST_MODE mode: *** Failing the test(s):$FAILED_CASES"
   $ECHO
   exit 1
 else

mysql-test/r/ndb_index_ordered.result

@@ -310,3 +310,113 @@ SubscrID	SbclID
 3	NULL
 drop table test1;
 drop table test2;
+create table t1 (
+pk int primary key,
+dt datetime not null,
+da date not null,
+ye year not null,
+ti time not null,
+ts timestamp not null,
+index(dt),
+index(da),
+index(ye),
+index(ti),
+index(ts)
+) engine=ndb;
+insert into t1 (pk,dt,da,ye,ti) values
+(1, '1901-05-05 23:00:59', '1901-05-05', '1901', '23:00:59'),
+(2, '1912-09-05 13:00:59', '1912-09-05', '1912', '13:00:59'),
+(3, '1945-12-31 00:00:00', '1945-12-31', '1945', '00:00:00'),
+(4, '1955-12-31 00:00:00', '1955-12-31', '1955', '00:00:00'),
+(5, '1963-06-06 06:06:06', '1963-06-06', '1963', '06:06:06'),
+(6, '1993-06-06 06:06:06', '1993-06-06', '1993', '06:06:06'),
+(7, '2001-01-01 10:11:10', '2001-01-01', '2001', '10:11:10'),
+(8, '2001-01-01 10:11:11', '2001-01-01', '2001', '10:11:11'),
+(9, '2005-01-31 23:59:59', '2005-01-31', '2005', '23:59:59');
+select count(*)-9 from t1 use index (dt) where dt >  '1900-01-01 00:00:00';
+count(*)-9
+0
+select count(*)-6 from t1 use index (dt) where dt >= '1955-12-31 00:00:00';
+count(*)-6
+0
+select count(*)-5 from t1 use index (dt) where dt >  '1955-12-31 00:00:00';
+count(*)-5
+0
+select count(*)-5 from t1 use index (dt) where dt <  '1970-03-03 22:22:22';
+count(*)-5
+0
+select count(*)-7 from t1 use index (dt) where dt <  '2001-01-01 10:11:11';
+count(*)-7
+0
+select count(*)-8 from t1 use index (dt) where dt <= '2001-01-01 10:11:11';
+count(*)-8
+0
+select count(*)-9 from t1 use index (dt) where dt <= '2055-01-01 00:00:00';
+count(*)-9
+0
+select count(*)-9 from t1 use index (da) where da >  '1900-01-01';
+count(*)-9
+0
+select count(*)-6 from t1 use index (da) where da >= '1955-12-31';
+count(*)-6
+0
+select count(*)-5 from t1 use index (da) where da >  '1955-12-31';
+count(*)-5
+0
+select count(*)-5 from t1 use index (da) where da <  '1970-03-03';
+count(*)-5
+0
+select count(*)-6 from t1 use index (da) where da <  '2001-01-01';
+count(*)-6
+0
+select count(*)-8 from t1 use index (da) where da <= '2001-01-02';
+count(*)-8
+0
+select count(*)-9 from t1 use index (da) where da <= '2055-01-01';
+count(*)-9
+0
+select count(*)-9 from t1 use index (ye) where ye >  '1900';
+count(*)-9
+0
+select count(*)-6 from t1 use index (ye) where ye >= '1955';
+count(*)-6
+0
+select count(*)-5 from t1 use index (ye) where ye >  '1955';
+count(*)-5
+0
+select count(*)-5 from t1 use index (ye) where ye <  '1970';
+count(*)-5
+0
+select count(*)-6 from t1 use index (ye) where ye <  '2001';
+count(*)-6
+0
+select count(*)-8 from t1 use index (ye) where ye <= '2001';
+count(*)-8
+0
+select count(*)-9 from t1 use index (ye) where ye <= '2055';
+count(*)-9
+0
+select count(*)-9 from t1 use index (ti) where ti >= '00:00:00';
+count(*)-9
+0
+select count(*)-7 from t1 use index (ti) where ti >  '00:00:00';
+count(*)-7
+0
+select count(*)-7 from t1 use index (ti) where ti >  '05:05:05';
+count(*)-7
+0
+select count(*)-5 from t1 use index (ti) where ti >  '06:06:06';
+count(*)-5
+0
+select count(*)-5 from t1 use index (ti) where ti <  '10:11:11';
+count(*)-5
+0
+select count(*)-6 from t1 use index (ti) where ti <= '10:11:11';
+count(*)-6
+0
+select count(*)-8 from t1 use index (ti) where ti <  '23:59:59';
+count(*)-8
+0
+select count(*)-9 from t1 use index (ti) where ti <= '23:59:59';
+count(*)-9
+0

mysql-test/r/type_float.result

@@ -143,3 +143,39 @@ drop table t1;
 create table t1 (f float(54));
 ERROR 42000: Incorrect column specifier for column 'f'
 drop table if exists t1;
+create table t1 (f float(4,3));
+insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
+Warnings:
+Warning	1264	Data truncated; out of range for column 'f' at row 1
+Warning	1264	Data truncated; out of range for column 'f' at row 2
+Warning	1264	Data truncated; out of range for column 'f' at row 3
+Warning	1264	Data truncated; out of range for column 'f' at row 4
+Warning	1264	Data truncated; out of range for column 'f' at row 5
+Warning	1264	Data truncated; out of range for column 'f' at row 6
+select * from t1;
+f
+-9.999
+-9.999
+-9.999
+9.999
+9.999
+9.999
+drop table if exists t1;
+create table t1 (f double(4,3));
+insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
+Warnings:
+Warning	1264	Data truncated; out of range for column 'f' at row 1
+Warning	1264	Data truncated; out of range for column 'f' at row 2
+Warning	1264	Data truncated; out of range for column 'f' at row 3
+Warning	1264	Data truncated; out of range for column 'f' at row 4
+Warning	1264	Data truncated; out of range for column 'f' at row 5
+Warning	1264	Data truncated; out of range for column 'f' at row 6
+select * from t1;
+f
+-9.999
+-9.999
+-9.999
+9.999
+9.999
+9.999
+drop table if exists t1;

mysql-test/r/type_float.result.es

@@ -143,3 +143,39 @@ drop table t1;
 create table t1 (f float(54));
 ERROR 42000: Incorrect column specifier for column 'f'
 drop table if exists t1;
+create table t1 (f float(4,3));
+insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
+Warnings:
+Warning	1264	Data truncated; out of range for column 'f' at row 1
+Warning	1264	Data truncated; out of range for column 'f' at row 2
+Warning	1264	Data truncated; out of range for column 'f' at row 3
+Warning	1264	Data truncated; out of range for column 'f' at row 4
+Warning	1264	Data truncated; out of range for column 'f' at row 5
+Warning	1264	Data truncated; out of range for column 'f' at row 6
+select * from t1;
+f
+-9.999
+-9.999
+-9.999
+9.999
+9.999
+9.999
+drop table if exists t1;
+create table t1 (f double(4,3));
+insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
+Warnings:
+Warning	1264	Data truncated; out of range for column 'f' at row 1
+Warning	1264	Data truncated; out of range for column 'f' at row 2
+Warning	1264	Data truncated; out of range for column 'f' at row 3
+Warning	1264	Data truncated; out of range for column 'f' at row 4
+Warning	1264	Data truncated; out of range for column 'f' at row 5
+Warning	1264	Data truncated; out of range for column 'f' at row 6
+select * from t1;
+f
+-9.999
+-9.999
+-9.999
+9.999
+9.999
+9.999
+drop table if exists t1;

mysql-test/suite/jp/r/jp_charlength_sjis.result

+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+drop table if exists `Ｔ４`;
+drop table if exists `Ｔ５`;
+drop table if exists `Ｔ６`;
+drop table if exists `Ｔ７`;
+drop table if exists `Ｔ８`;
+drop table if exists `Ｔ９`;
+drop table if exists `Ｔ１０`;
+drop table if exists `Ｔ１１`;
+drop table if exists `Ｔ１２`;
+SET NAMES sjis;
+SET character_set_database = sjis;
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ｱ	1
+ｱｲ	2
+ｱｲｳ	3
+ｱｲｳｴ	4
+ｱｲｳｴｵ	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ２`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+あ	1
+あい	2
+あいう	3
+あいうえ	4
+あいうえお	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ３`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ソ	1
+ソ十	2
+ソ十表	3
+ソ十表予	4
+ソ十表予構	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ４`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ｱ	1
+ｱｲ	2
+ｱｲｳ	3
+ｱｲｳｴ	4
+ｱｲｳｴｵ	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ５`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+あ	1
+あい	2
+あいう	3
+あいうえ	4
+あいうえお	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ６`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ソ	1
+ソ十	2
+ソ十表	3
+ソ十表予	4
+ソ十表予構	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ７`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ｱｲｳｴｵ	5
+ｱｲｳｴ	4
+ｱｲｳ	3
+ｱｲ	2
+ｱ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ８`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+あいうえお	5
+あいうえ	4
+あいう	3
+あい	2
+あ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ソ十表予構	5
+ソ十表予	4
+ソ十表	3
+ソ十	2
+ソ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ｱｲｳｴｵ	5
+ｱｲｳｴ	4
+ｱｲｳ	3
+ｱｲ	2
+ｱ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+あいうえお	5
+あいうえ	4
+あいう	3
+あい	2
+あ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ソ十表予構	5
+ソ十表予	4
+ソ十表	3
+ソ十	2
+ソ	1
+	0
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;

mysql-test/suite/jp/r/jp_charlength_ucs2.result

+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+drop table if exists `Ｔ４`;
+drop table if exists `Ｔ５`;
+drop table if exists `Ｔ６`;
+drop table if exists `Ｔ７`;
+drop table if exists `Ｔ８`;
+drop table if exists `Ｔ９`;
+drop table if exists `Ｔ１０`;
+drop table if exists `Ｔ１１`;
+drop table if exists `Ｔ１２`;
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ｱ	1
+ｱｲ	2
+ｱｲｳ	3
+ｱｲｳｴ	4
+ｱｲｳｴｵ	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ２`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+あ	1
+あい	2
+あいう	3
+あいうえ	4
+あいうえお	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ３`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+龔	1
+龔龖	2
+龔龖龗	3
+龔龖龗龞	4
+龔龖龗龞龡	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ４`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ｱ	1
+ｱｲ	2
+ｱｲｳ	3
+ｱｲｳｴ	4
+ｱｲｳｴｵ	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ５`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+あ	1
+あい	2
+あいう	3
+あいうえ	4
+あいうえお	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ６`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+龔	1
+龔龖	2
+龔龖龗	3
+龔龖龗龞	4
+龔龖龗龞龡	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ７`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ｱｲｳｴｵ	5
+ｱｲｳｴ	4
+ｱｲｳ	3
+ｱｲ	2
+ｱ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ８`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+あいうえお	5
+あいうえ	4
+あいう	3
+あい	2
+あ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+龔龖龗龞龡	5
+龔龖龗龞	4
+龔龖龗	3
+龔龖	2
+龔	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ｱｲｳｴｵ	5
+ｱｲｳｴ	4
+ｱｲｳ	3
+ｱｲ	2
+ｱ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+あいうえお	5
+あいうえ	4
+あいう	3
+あい	2
+あ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+龔龖龗龞龡	5
+龔龖龗龞	4
+龔龖龗	3
+龔龖	2
+龔	1
+	0
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;

mysql-test/suite/jp/r/jp_charlength_ujis.result

+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+drop table if exists `Ｔ４`;
+drop table if exists `Ｔ５`;
+drop table if exists `Ｔ６`;
+drop table if exists `Ｔ７`;
+drop table if exists `Ｔ８`;
+drop table if exists `Ｔ９`;
+drop table if exists `Ｔ１０`;
+drop table if exists `Ｔ１１`;
+drop table if exists `Ｔ１２`;
+SET NAMES ujis;
+SET character_set_database = ujis;
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ｱ	1
+ｱｲ	2
+ｱｲｳ	3
+ｱｲｳｴ	4
+ｱｲｳｴｵ	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ２`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+あ	1
+あい	2
+あいう	3
+あいうえ	4
+あいうえお	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ３`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+龔	1
+龔龖	2
+龔龖龗	3
+龔龖龗龞	4
+龔龖龗龞龡	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ４`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ｱ	1
+ｱｲ	2
+ｱｲｳ	3
+ｱｲｳｴ	4
+ｱｲｳｴｵ	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ５`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+あ	1
+あい	2
+あいう	3
+あいうえ	4
+あいうえお	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ６`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+龔	1
+龔龖	2
+龔龖龗	3
+龔龖龗龞	4
+龔龖龗龞龡	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ７`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ｱｲｳｴｵ	5
+ｱｲｳｴ	4
+ｱｲｳ	3
+ｱｲ	2
+ｱ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ８`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+あいうえお	5
+あいうえ	4
+あいう	3
+あい	2
+あ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+龔龖龗龞龡	5
+龔龖龗龞	4
+龔龖龗	3
+龔龖	2
+龔	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ｱｲｳｴｵ	5
+ｱｲｳｴ	4
+ｱｲｳ	3
+ｱｲ	2
+ｱ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+あいうえお	5
+あいうえ	4
+あいう	3
+あい	2
+あ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+龔龖龗龞龡	5
+龔龖龗龞	4
+龔龖龗	3
+龔龖	2
+龔	1
+	0
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;

mysql-test/suite/jp/r/jp_charlength_utf8.result

+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+drop table if exists `Ｔ４`;
+drop table if exists `Ｔ５`;
+drop table if exists `Ｔ６`;
+drop table if exists `Ｔ７`;
+drop table if exists `Ｔ８`;
+drop table if exists `Ｔ９`;
+drop table if exists `Ｔ１０`;
+drop table if exists `Ｔ１１`;
+drop table if exists `Ｔ１２`;
+SET NAMES utf8;
+SET character_set_database = utf8;
+CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ４` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ５` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
+INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
+INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ｱ	1
+ｱｲ	2
+ｱｲｳ	3
+ｱｲｳｴ	4
+ｱｲｳｴｵ	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ２`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+あ	1
+あい	2
+あいう	3
+あいうえ	4
+あいうえお	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ３`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+龔	1
+龔龖	2
+龔龖龗	3
+龔龖龗龞	4
+龔龖龗龞龡	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ４`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+ｱ	1
+ｱｲ	2
+ｱｲｳ	3
+ｱｲｳｴ	4
+ｱｲｳｴｵ	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ５`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+あ	1
+あい	2
+あいう	3
+あいうえ	4
+あいうえお	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ６`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+	0
+龔	1
+龔龖	2
+龔龖龗	3
+龔龖龗龞	4
+龔龖龗龞龡	5
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ７`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ｱｲｳｴｵ	5
+ｱｲｳｴ	4
+ｱｲｳ	3
+ｱｲ	2
+ｱ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ８`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+あいうえお	5
+あいうえ	4
+あいう	3
+あい	2
+あ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+龔龖龗龞龡	5
+龔龖龗龞	4
+龔龖龗	3
+龔龖	2
+龔	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+ｱｲｳｴｵ	5
+ｱｲｳｴ	4
+ｱｲｳ	3
+ｱｲ	2
+ｱ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+あいうえお	5
+あいうえ	4
+あいう	3
+あい	2
+あ	1
+	0
+SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
+Ｃ１	CHAR_LENGTH(`Ｃ１`)
+龔龖龗龞龡	5
+龔龖龗龞	4
+龔龖龗	3
+龔龖	2
+龔	1
+	0
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;

mysql-test/suite/jp/r/jp_charset_sjis.result

+drop table if exists `sP`;
+drop table if exists `sQ`;
+drop table if exists `sR`;
+drop table if exists `sS`;
+drop table if exists `sT`;
+drop table if exists `sU`;
+drop table if exists `sV`;
+drop table if exists `sW`;
+drop table if exists `sX`;
+drop table if exists `sPO`;
+drop table if exists `sPP`;
+drop table if exists `sPQ`;
+SET NAMES sjis;
+SET character_set_database = sjis;
+CREATE TABLE `sP` (`bP` char(20)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `sQ` (`bP` char(20)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `sR` (`bP` char(20)) DEFAULT CHARSET = sjis engine = innodb;
+CREATE TABLE `sS` (`bP` char(20)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `sT` (`bP` char(20)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `sU` (`bP` char(20)) DEFAULT CHARSET = sjis engine = myisam;
+CREATE TABLE `sV` (`bP` char(20)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `sW` (`bP` char(20)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `sX` (`bP` char(20)) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `sPO` (`bP` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `sPP` (`bP` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `sPQ` (`bP` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `sP`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `sQ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sR`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `sS`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `sT`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sU`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `sV`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `sW`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sX`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `sPO`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `sPP`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sPQ`;
+SELECT DISTINCT CHARSET(`bP`) FROM `sP`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(`bP`) FROM `sQ`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(`bP`) FROM `sR`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sP`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sP`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sP`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sP`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sQ`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sQ`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sQ`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sQ`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sR`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sR`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sR`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sR`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`bP`) FROM `sS`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(`bP`) FROM `sT`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(`bP`) FROM `sU`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sS`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sS`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sS`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sS`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sT`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sT`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sT`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sT`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sU`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sU`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sU`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sU`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`bP`) FROM `sV`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(`bP`) FROM `sW`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(`bP`) FROM `sX`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sV`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sV`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sV`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sV`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sW`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sW`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sW`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sW`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sX`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sX`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sX`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sX`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`bP`) FROM `sPO`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(`bP`) FROM `sPP`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(`bP`) FROM `sPQ`;
+CHARSET(`bP`)
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPO`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPO`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPO`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPO`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPP`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPP`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPP`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPP`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPQ`;
+CHARSET(CONVERT(`bP` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPQ`;
+CHARSET(CONVERT(`bP` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPQ`;
+CHARSET(CONVERT(`bP` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPQ`;
+CHARSET(CONVERT(`bP` USING ujis))
+ujis
+drop table `sP`;
+drop table `sQ`;
+drop table `sR`;
+drop table `sS`;
+drop table `sT`;
+drop table `sU`;
+drop table `sV`;
+drop table `sW`;
+drop table `sX`;
+drop table `sPO`;
+drop table `sPP`;
+drop table `sPQ`;

mysql-test/suite/jp/r/jp_charset_ujis.result

+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+drop table if exists `ԣ`;
+SET NAMES ujis;
+SET character_set_database = ujis;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `ԣ`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `ԣ`;
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
+CHARSET(`ã`)
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
+CHARSET(CONVERT(`ã` USING ujis))
+ujis
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;
+drop table `ԣ`;

mysql-test/suite/jp/r/jp_charset_utf8.result

+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+drop table if exists `Ｔ４`;
+drop table if exists `Ｔ５`;
+drop table if exists `Ｔ６`;
+drop table if exists `Ｔ７`;
+drop table if exists `Ｔ８`;
+drop table if exists `Ｔ９`;
+drop table if exists `Ｔ１０`;
+drop table if exists `Ｔ１１`;
+drop table if exists `Ｔ１２`;
+SET NAMES utf8;
+SET character_set_database = utf8;
+CREATE TABLE `Ｔ１` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ２`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ３`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ４`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ５`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ６`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ７`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ８`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ９`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１０`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ１１`;
+LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ１２`;
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ２`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ３`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ２`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ２`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ２`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ２`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ３`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ３`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ３`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ３`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ４`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ５`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ６`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ４`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ４`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ４`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ４`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ５`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ５`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ５`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ５`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ６`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ６`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ６`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ６`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ７`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ８`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ９`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ７`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ７`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ７`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ７`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ８`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ８`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ８`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ８`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ９`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ９`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ９`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
+CHARSET(`Ｃ１`)
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
+CHARSET(CONVERT(`Ｃ１` USING utf8))
+utf8
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
+CHARSET(CONVERT(`Ｃ１` USING ucs2))
+ucs2
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
+CHARSET(CONVERT(`Ｃ１` USING sjis))
+sjis
+SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
+CHARSET(CONVERT(`Ｃ１` USING ujis))
+ujis
+drop table `Ｔ１`;
+drop table `Ｔ２`;
+drop table `Ｔ３`;
+drop table `Ｔ４`;
+drop table `Ｔ５`;
+drop table `Ｔ６`;
+drop table `Ｔ７`;
+drop table `Ｔ８`;
+drop table `Ｔ９`;
+drop table `Ｔ１０`;
+drop table `Ｔ１１`;
+drop table `Ｔ１２`;

mysql-test/suite/jp/r/jp_create_db_sjis.result

+SET NAMES sjis;
+SET character_set_database = sjis;
+drop database if exists `ﾆﾎﾝｺﾞ`;
+drop database if exists `日本語`;
+drop database if exists `ソ十表`;
+CREATE DATABASE `ﾆﾎﾝｺﾞ`;
+CREATE DATABASE `日本語`;
+CREATE DATABASE `ソ十表`;
+SHOW DATABASES;
+Database
+mysql
+test
+ソ十表
+日本語
+ﾆﾎﾝｺﾞ
+USE `ﾆﾎﾝｺﾞ`;
+USE `日本語`;
+USE `ソ十表`;
+DROP DATABASE `ﾆﾎﾝｺﾞ`;
+DROP DATABASE `日本語`;
+DROP DATABASE `ソ十表`;

mysql-test/suite/jp/r/jp_create_db_ucs2.result

+drop database if exists `ﾆﾎﾝｺﾞ`;
+drop database if exists `日本語`;
+drop database if exists `龔龖龗`;
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET character_set_server = ucs2;
+CREATE DATABASE `ﾆﾎﾝｺﾞ`;
+CREATE DATABASE `日本語`;
+CREATE DATABASE `龔龖龗`;
+SHOW DATABASES;
+Database
+mysql
+test
+日本語
+龔龖龗
+ﾆﾎﾝｺﾞ
+USE `ﾆﾎﾝｺﾞ`;
+USE `日本語`;
+USE `龔龖龗`;
+DROP DATABASE `ﾆﾎﾝｺﾞ`;
+DROP DATABASE `日本語`;
+DROP DATABASE `龔龖龗`;

mysql-test/suite/jp/r/jp_create_db_ujis.result

+drop database if exists `ﾆﾎﾝｺﾞ`;
+drop database if exists `日本語`;
+drop database if exists `龔龖龗`;
+SET NAMES ujis;
+SET character_set_database = ujis;
+CREATE DATABASE `ﾆﾎﾝｺﾞ`;
+CREATE DATABASE `日本語`;
+CREATE DATABASE `龔龖龗`;
+SHOW DATABASES;
+Database
+mysql
+test
+日本語
+龔龖龗
+ﾆﾎﾝｺﾞ
+USE `ﾆﾎﾝｺﾞ`;
+USE `日本語`;
+USE `龔龖龗`;
+DROP DATABASE `ﾆﾎﾝｺﾞ`;
+DROP DATABASE `日本語`;
+DROP DATABASE `龔龖龗`;

mysql-test/suite/jp/r/jp_create_db_utf8.result

+drop database if exists `ﾆﾎﾝｺﾞ`;
+drop database if exists `日本語`;
+drop database if exists `龔龖龗`;
+SET NAMES utf8;
+SET character_set_database = utf8;
+CREATE DATABASE `ﾆﾎﾝｺﾞ`;
+CREATE DATABASE `日本語`;
+CREATE DATABASE `龔龖龗`;
+SHOW DATABASES;
+Database
+mysql
+test
+日本語
+龔龖龗
+ﾆﾎﾝｺﾞ
+USE `ﾆﾎﾝｺﾞ`;
+USE `日本語`;
+USE `龔龖龗`;
+DROP DATABASE `ﾆﾎﾝｺﾞ`;
+DROP DATABASE `日本語`;
+DROP DATABASE `龔龖龗`;

mysql-test/suite/jp/r/jp_enum_ucs2.result

+drop table if exists `Ｔ１`;
+drop table if exists `Ｔ２`;
+drop table if exists `Ｔ３`;
+drop table if exists `Ｔ４`;
+drop table if exists `Ｔ５`;
+drop table if exists `Ｔ６`;
+drop table if exists `Ｔ７`;
+drop table if exists `Ｔ８`;
+drop table if exists `Ｔ９`;
+drop table if exists `Ｔ１０`;
+drop table if exists `Ｔ１１`;
+drop table if exists `Ｔ１２`;
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+CREATE TABLE `Ｔ１` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+INSERT INTO `Ｔ１` VALUES ('ｱ'),('ｲ'),('ｳ');
+INSERT INTO `Ｔ２` VALUES ('あ'),('い'),('う');
+INSERT INTO `Ｔ３` VALUES ('龔'),('龖'),('龗');
+INSERT INTO `Ｔ４` VALUES ('ｱ'),('ｲ'),('ｳ');
+INSERT INTO `Ｔ５` VALUES ('あ'),('い'),('う');
+INSERT INTO `Ｔ６` VALUES ('龔'),('龖'),('龗');
+INSERT INTO `Ｔ７` VALUES ('ｱ'),('ｲ'),('ｳ');
+INSERT INTO `Ｔ８` VALUES ('あ'),('い'),('う');
+INSERT INTO `Ｔ９` VALUES ('龔'),('龖'),('龗');
+INSERT INTO `Ｔ１０` VALUES ('ｱ'),('ｲ'),('ｳ');
+INSERT INTO `Ｔ１１` VALUES ('あ'),('い'),('う');
+INSERT INTO `Ｔ１２` VALUES ('龔'),('龖'),('龗');
+SELECT * FROM `Ｔ１`;
+Ｃ１
+ｱ
+ｲ
+ｳ
+SELECT * FROM `Ｔ２`;
+Ｃ１
+あ
+い
+う
+SELECT * FROM `Ｔ３`;
+Ｃ１
+龔
+龖
+龗
+SELECT * FROM `Ｔ４`;
+Ｃ１
+ｱ
+ｲ
+ｳ
+SELECT * FROM `Ｔ５`;
+Ｃ１
+あ
+い
+う
+SELECT * FROM `Ｔ６`;
+Ｃ１
+龔
+龖
+龗
+SELECT * FROM `Ｔ７`;
+Ｃ１
+ｱ
+ｲ
+ｳ
+SELECT * FROM `Ｔ８`;
+Ｃ１
+あ
+い
+う
+SELECT * FROM `Ｔ９`;
+Ｃ１
+龔
+龖
+龗
+SELECT * FROM `Ｔ１０`;
+Ｃ１
+ｱ
+ｲ
+ｳ
+SELECT * FROM `Ｔ１１`;
+Ｃ１
+あ
+い
+う
+SELECT * FROM `Ｔ１２`;
+Ｃ１
+龔
+龖
+龗
+SHOW CREATE TABLE `Ｔ１`;
+Table	Create Table
+Ｔ１	CREATE TABLE `Ｔ１` (
+  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ２`;
+Table	Create Table
+Ｔ２	CREATE TABLE `Ｔ２` (
+  `Ｃ１` enum('あ','い','う') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ３`;
+Table	Create Table
+Ｔ３	CREATE TABLE `Ｔ３` (
+  `Ｃ１` enum('龔','龖','龗') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ４`;
+Table	Create Table
+Ｔ４	CREATE TABLE `Ｔ４` (
+  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ５`;
+Table	Create Table
+Ｔ５	CREATE TABLE `Ｔ５` (
+  `Ｃ１` enum('あ','い','う') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ６`;
+Table	Create Table
+Ｔ６	CREATE TABLE `Ｔ６` (
+  `Ｃ１` enum('龔','龖','龗') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ７`;
+Table	Create Table
+Ｔ７	CREATE TABLE `Ｔ７` (
+  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=HEAP DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ８`;
+Table	Create Table
+Ｔ８	CREATE TABLE `Ｔ８` (
+  `Ｃ１` enum('あ','い','う') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=HEAP DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ９`;
+Table	Create Table
+Ｔ９	CREATE TABLE `Ｔ９` (
+  `Ｃ１` enum('龔','龖','龗') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=HEAP DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ１０`;
+Table	Create Table
+Ｔ１０	CREATE TABLE `Ｔ１０` (
+  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ１１`;
+Table	Create Table
+Ｔ１１	CREATE TABLE `Ｔ１１` (
+  `Ｃ１` enum('あ','い','う') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ１２`;
+Table	Create Table
+Ｔ１２	CREATE TABLE `Ｔ１２` (
+  `Ｃ１` enum('龔','龖','龗') default NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+DESC `Ｔ１`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
+DESC `Ｔ２`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
+DESC `Ｔ３`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
+DESC `Ｔ４`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
+DESC `Ｔ５`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
+DESC `Ｔ６`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
+DESC `Ｔ７`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
+DESC `Ｔ８`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
+DESC `Ｔ９`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
+DESC `Ｔ１０`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
+DESC `Ｔ１１`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
+DESC `Ｔ１２`;
+Field	Type	Null	Key	Default	Extra
+Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;
+DROP TABLE `Ｔ４`;
+DROP TABLE `Ｔ５`;
+DROP TABLE `Ｔ６`;
+DROP TABLE `Ｔ７`;
+DROP TABLE `Ｔ８`;
+DROP TABLE `Ｔ９`;
+DROP TABLE `Ｔ１０`;
+DROP TABLE `Ｔ１１`;
+DROP TABLE `Ｔ１２`;