Commit 2506bfe8 authored by unknown's avatar unknown
Browse files

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

into zim.(none):/home/brian/mysql/mysql-4.1
parents fe3beec4 3785d218

bdb/btree/bt_open.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ __bam_new_file(dbp, txn, fhp, name) 
			goto err;

	} else {

#ifdef DIAGNOSTIC

		memset(buf, dbp->pgsize, 0);

		memset(buf, 0, dbp->pgsize);

#endif

		root = (PAGE *)buf;

	}

bdb/hash/hash_open.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ __ham_new_file(dbp, txn, fhp, name) 
			goto err;

	} else {

#ifdef DIAGNOSTIC

		memset(buf, dbp->pgsize, 0);

		memset(buf, 0, dbp->pgsize);

#endif

		page = (PAGE *)buf;

	}

client/mysql.cc

+6 −1
Original line number Diff line number Diff line
@@ -3073,10 +3073,15 @@ void tee_fprintf(FILE *file, const char *fmt, ...) 
#ifdef OS2

  fflush( file);

#endif

  va_end(args);



  if (opt_outfile)

  {

    va_start(args, fmt);

    (void) vfprintf(OUTFILE, fmt, args);

    va_end(args);

  }

}





void tee_fputs(const char *s, FILE *file)

mysql-test/r/ctype_big5.result

+7 −0
Original line number Diff line number Diff line
@@ -77,3 +77,10 @@ big5_bin 6109 
big5_bin	61

big5_bin	6120

drop table t1;

SET NAMES big5;

CREATE TABLE t1 (a text) character set big5;

INSERT INTO t1 VALUES ('ùØ');

SELECT * FROM t1;

a

ùØ

DROP TABLE t1;

mysql-test/t/ctype_big5.test

+9 −0
Original line number Diff line number Diff line
@@ -16,3 +16,12 @@ SET collation_connection='big5_chinese_ci'; 
-- source include/ctype_filesort.inc

SET collation_connection='big5_bin';

-- source include/ctype_filesort.inc



#

# Bugs#9357: TEXT columns break string with special word in BIG5 charset.

#

SET NAMES big5;

CREATE TABLE t1 (a text) character set big5;

INSERT INTO t1 VALUES ('');

SELECT * FROM t1;

DROP TABLE t1;