bk commit into 4.1 tree (bar:1.2064) BUG#8840

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2064 05/03/03 14:15:37 bar@stripped +5 -0
  Bug#8840 Empty string comparison and character set 'cp1250'
  Secondary weight out of bounds was picked up in mistake when
  the string is empty, instead of returning 0.

  mysql-test/t/ctype_cp1250_ch.test
    1.1 05/03/03 14:15:31 bar@stripped +12 -0

  mysql-test/r/have_cp1250_ch.require
    1.1 05/03/03 14:15:31 bar@stripped +2 -0

  mysql-test/r/ctype_cp1250_ch.result
    1.1 05/03/03 14:15:31 bar@stripped +9 -0

  mysql-test/t/ctype_cp1250_ch.test
    1.0 05/03/03 14:15:31 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/ctype_cp1250_ch.test

  mysql-test/r/have_cp1250_ch.require
    1.0 05/03/03 14:15:31 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/have_cp1250_ch.require

  mysql-test/r/ctype_cp1250_ch.result
    1.0 05/03/03 14:15:31 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_cp1250_ch.result

  mysql-test/include/have_cp1250_ch.inc
    1.1 05/03/03 14:15:30 bar@stripped +4 -0

  strings/ctype-win1250ch.c
    1.44 05/03/03 14:15:30 bar@stripped +1 -1
    Bug#8840 Empty string comparison and character set 'cp1250'
    Secondary weight out of bounds was picked up in mistake when
    the string is empty, instead of returning 0.

  mysql-test/include/have_cp1250_ch.inc
    1.0 05/03/03 14:15:30 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/include/have_cp1250_ch.inc

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.43/strings/ctype-win1250ch.c	2005-01-13 18:11:57 +04:00
+++ 1.44/strings/ctype-win1250ch.c	2005-03-03 14:15:30 +04:00
@@ -416,7 +416,7 @@
 #define NEXT_CMP_VALUE(src, p, pass, value, len)			\
 	while (1) {							\
 		if (IS_END(p, src, len)) {				\
-			if (pass == 0) { p = src; pass++; }		\
+			if (pass == 0 && len > 0) { p= src; pass++; }	\
 			else { value = 0; break; }			\
 		}							\
 		value = ((pass == 0) ? _sort_order_win1250ch1[*p]	\
--- New file ---
+++ mysql-test/include/have_cp1250_ch.inc	05/03/03 14:15:30
-- require r/have_cp1250_ch.require
disable_query_log;
show collation like "cp1250_czech_cs";
enable_query_log;

--- New file ---
+++ mysql-test/r/ctype_cp1250_ch.result	05/03/03 14:15:31
SHOW COLLATION LIKE 'cp1250_czech_cs';
Collation	Charset	Id	Default	Compiled	Sortlen
cp1250_czech_cs	cp1250	34		Yes	2
CREATE TABLE t1 (a char(16)) character set cp1250 collate cp1250_czech_cs;
INSERT INTO t1 VALUES ('');
SELECT a, length(a), a='', a=' ', a='  ' FROM t1;
a	length(a)	a=''	a=' '	a='  '
	0	1	1	1
DROP TABLE t1;

--- New file ---
+++ mysql-test/r/have_cp1250_ch.require	05/03/03 14:15:31
Collation	Charset	Id	Default	Compiled	Sortlen
cp1250_czech_cs	cp1250	34		Yes	2

--- New file ---
+++ mysql-test/t/ctype_cp1250_ch.test	05/03/03 14:15:31
-- source include/have_cp1250_ch.inc

SHOW COLLATION LIKE 'cp1250_czech_cs';

#
# Bugs: #8840: Empty string comparison and character set 'cp1250'
#

CREATE TABLE t1 (a char(16)) character set cp1250 collate cp1250_czech_cs;
INSERT INTO t1 VALUES ('');
SELECT a, length(a), a='', a=' ', a='  ' FROM t1;
DROP TABLE t1;