Commit 01ba6b1d authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
parents 2c546db3 0b45706c

mysql-test/r/type_blob.result

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ t3 CREATE TABLE `t3` ( 
drop table t1,t2,t3

#;

CREATE TABLE t1 (a char(257) default "hello");

ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB instead

ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead

CREATE TABLE t2 (a blob default "hello");

ERROR 42000: BLOB/TEXT column 'a' can't have a default value

drop table if exists t1,t2;

sql/mysqld.cc

+0 −2
Original line number Diff line number Diff line
@@ -3990,8 +3990,6 @@ pthread_handler_decl(handle_connections_shared_memory,arg) 
	      NullS);

      sql_perror(buff);

    }

    my_security_attr_free(sa_event);

    my_security_attr_free(sa_mapping);

    if (handle_client_file_map) 

      CloseHandle(handle_client_file_map);

    if (handle_client_map)

sql/share/english/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ character-set=latin1 
"Specified key was too long; max key length is %d bytes",

"Key column '%-.64s' doesn't exist in table",

"BLOB column '%-.64s' can't be used in key specification with the used table type",

"Column length too big for column '%-.64s' (max = %d); use BLOB instead",

"Column length too big for column '%-.64s' (max = %d); use BLOB or TEXT instead",

"Incorrect table definition; there can be only one auto column and it must be defined as a key",

"%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d",

"%s: Normal shutdown\n",

strings/ctype-big5.c

+1 −5
Original line number Diff line number Diff line
@@ -6284,11 +6284,7 @@ uint my_well_formed_len_big5(CHARSET_INFO *cs __attribute__((unused)), 
  const char *emb= e - 1; /* Last possible end of an MB character */

  while (pos && b < e)

  {

    /*

      Cast to int8 for extra safety. "char" can be unsigned

      by default on some platforms.

    */

    if (((int8)b[0]) >= 0)

    if ((uchar) b[0] < 128)

    {

      /* Single byte ascii character */

      b++;

strings/ctype-sjis.c

+1 −6
Original line number Diff line number Diff line
@@ -4576,12 +4576,7 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)), 
  const char *b0= b;

  while (pos && b < e)

  {

    /*

      Cast to int8 for extra safety.

      "char" can be unsigned by default

      on some platforms.

    */

    if (((int8)b[0]) >= 0)

    if ((uchar) b[0] < 128)

    {

      /* Single byte ascii character */

      b++;