Commit 5a0b54fd authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.h:
  Auto merged
mysql-test/r/mysql.result:
  Manual merge
mysql-test/t/mysql.test:
  Manual merge
parents f3c26f7d 89220d07

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ client/sql_string.cpp 
client/ssl_test

client/thimble

client/thread_test

client/tmp.diff

client_debug/*

client_release/*

client_test
@@ -762,10 +763,12 @@ mysql-test/r/rpl000016.eval 
mysql-test/r/rpl_log.eval

mysql-test/r/slave-running.eval

mysql-test/r/slave-stopped.eval

mysql-test/r/tmp.result

mysql-test/r/udf.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/t/index_merge.load

mysql-test/t/tmp.test

mysql-test/var

mysql-test/var/*

mysql.kdevprj

client/mysql.cc

+24 −3
Original line number Diff line number Diff line
@@ -820,9 +820,22 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    break;

  case OPT_DELIMITER:

    if (argument == disabled_my_option) 

    {

      strmov(delimiter, DEFAULT_DELIMITER);

    }

    else 

    {

      /* Check that delimiter does not contain a backslash */

      if (!strstr(argument, "\\")) 

      {

        strmake(delimiter, argument, sizeof(delimiter) - 1);

      }

      else 

      {

        put_info("DELIMITER cannot contain a backslash character", INFO_ERROR);

        return 0;

      } 

    }

    delimiter_length= (uint)strlen(delimiter);

    delimiter_str= delimiter;

    break;
@@ -3041,6 +3054,14 @@ com_delimiter(String *buffer __attribute__((unused)), char *line) 
	     INFO_ERROR);

    return 0;

  }

  else

  {

    if (strstr(tmp, "\\")) 

    {

      put_info("DELIMITER cannot contain a backslash character", INFO_ERROR);

      return 0;

    }

  }

  strmake(delimiter, tmp, sizeof(delimiter) - 1);

  delimiter_length= (int)strlen(delimiter);

  delimiter_str= delimiter;

mysql-test/r/func_misc.result

+7 −0
Original line number Diff line number Diff line
@@ -134,4 +134,11 @@ timediff(b, a) >= '00:00:03' 
drop table t2;

drop table t1;

set global query_cache_size=default;

create table t1 select INET_ATON('255.255.0.1') as `a`;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(21) unsigned default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

End of 5.0 tests

mysql-test/r/mysql.result

+11 −7
Original line number Diff line number Diff line
@@ -61,16 +61,16 @@ database() 
test

unlock tables;

drop table t1;

\

\

ƒ\

ƒ\

c_cp932

\

\

\

ƒ\

ƒ\

ƒ\

ソ

ソ

\

\

ƒ\

ƒ\

+----------------------+------------+--------+

| concat('>',col1,'<') | col2       | col3   |

+----------------------+------------+--------+
@@ -180,4 +180,8 @@ Too long dbname 
ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'

Too long hostname

ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)

1

1

ERROR at line 1: DELIMITER cannot contain a backslash character

ERROR at line 1: DELIMITER cannot contain a backslash character

End of 5.0 tests

mysql-test/t/func_misc.test

+7 −0
Original line number Diff line number Diff line
@@ -125,4 +125,11 @@ drop table t2; 
drop table t1;

set global query_cache_size=default;



#

# Bug #21466: INET_ATON() returns signed, not unsigned

#



create table t1 select INET_ATON('255.255.0.1') as `a`;

show create table t1;

drop table t1;

--echo End of 5.0 tests