Commit eae0bc94 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/my/mysql-4.1.13-clone 

into mysql.com:/space/my/mysql-4.1-build


mysql-test/t/ctype_utf8.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 86ae5158 297f80ed

mysql-test/t/ctype_utf8.test

+2 −0
Original line number Diff line number Diff line
@@ -785,12 +785,14 @@ INSERT INTO t1 VALUES 
(1,'blah','464','aaa','fkc1c9ilc20x0hgae7lx6j09','ERR','ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми','ИМРИ.АФИМИМ.АЕИМИМРИМДМРИМРМРИРОР',3,'2005-06-01 17:30:43','1234567890'),

(2,'blah','464','aaa','haxpl2ilc20x00bj4tt2m5ti','11','11 g','G',3,'2005-06-02 22:43:10','1234567890');



--disable_warnings

CREATE TABLE t2 (

  `msisdn` varchar(15) NOT NULL default '',

  `operator_id` int(11) NOT NULL default '0',

  `created` datetime NOT NULL default '0000-00-00 00:00:00',

  UNIQUE KEY `PK_user` (`msisdn`)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--enable_warnings



INSERT INTO t2 VALUES ('1234567890',2,'2005-05-24 13:53:25');

tests/mysql_client_test.c

+14 −4
Original line number Diff line number Diff line
@@ -166,6 +166,14 @@ DIE_UNLESS(stmt == 0);\ 
#define mytest_r(x) if (x) {myerror(NULL);DIE_UNLESS(FALSE);}





/* A workaround for Sun Forte 5.6 on Solaris x86 */



static int cmp_double(double *a, double *b)

{

  return *a == *b;

}





/* Print the error message */



static void print_error(const char *msg)
@@ -1396,7 +1404,7 @@ static void test_prepare() 
    DIE_UNLESS(real_data == o_real_data);

    DIE_UNLESS(length[5] == 4);



    DIE_UNLESS(double_data == o_double_data);

    DIE_UNLESS(cmp_double(&double_data, &o_double_data));

    DIE_UNLESS(length[6] == 8);



    DIE_UNLESS(strcmp(data, str_data) == 0);
@@ -9583,7 +9591,7 @@ static void test_bug3035() 
  uint32 uint32_val;

  longlong int64_val;

  ulonglong uint64_val;

  double double_val, udouble_val;

  double double_val, udouble_val, double_tmp;

  char longlong_as_string[22], ulonglong_as_string[22];



  /* mins and maxes */
@@ -9727,7 +9735,8 @@ static void test_bug3035() 
  DIE_UNLESS(int64_val == int64_min);

  DIE_UNLESS(uint64_val == uint64_min);

  DIE_UNLESS(double_val == (longlong) uint64_min);

  DIE_UNLESS(udouble_val == ulonglong2double(uint64_val));

  double_tmp= ulonglong2double(uint64_val);

  DIE_UNLESS(cmp_double(&udouble_val, &double_tmp));

  DIE_UNLESS(!strcmp(longlong_as_string, "0"));

  DIE_UNLESS(!strcmp(ulonglong_as_string, "0"));
@@ -9743,7 +9752,8 @@ static void test_bug3035() 
  DIE_UNLESS(int64_val == int64_max);

  DIE_UNLESS(uint64_val == uint64_max);

  DIE_UNLESS(double_val == (longlong) uint64_val);

  DIE_UNLESS(udouble_val == ulonglong2double(uint64_val));

  double_tmp= ulonglong2double(uint64_val);

  DIE_UNLESS(cmp_double(&udouble_val, &double_tmp));

  DIE_UNLESS(!strcmp(longlong_as_string, "-1"));

  DIE_UNLESS(!strcmp(ulonglong_as_string, "18446744073709551615"));