List:Internals« Previous MessageNext Message »
From:sinisa Date:January 12 2004 2:25pm
Subject:bk commit into 4.0 tree (Sinisa:1.1676)
View as plain text  
Below is the list of changes that have just been committed into a local
4.0 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1676 04/01/12 16:25:13 Sinisa@stripped +3 -0
  opt_sum.cc:
    A fix for a bug #3189, pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised

  mysql-test/r/type_blob.result
    1.12 04/01/12 16:24:48 Sinisa@stripped +6 -0

  mysql-test/t/type_blob.test
    1.12 04/01/12 16:24:42 Sinisa@stripped +6 -0

  sql/opt_sum.cc
    1.29 04/01/12 16:18:05 Sinisa@stripped +3 -1
    A fix for a bug #3189, pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.0

--- 1.28/sql/opt_sum.cc	Wed May  7 19:01:36 2003
+++ 1.29/sql/opt_sum.cc	Mon Jan 12 16:18:05 2004
@@ -443,7 +443,9 @@
 	// Save found constant
 	if (part->null_bit)
 	  *key_ptr++= (byte) test(part->field->is_null());
-	part->field->get_key_image((char*) key_ptr,part->length);
+	part->field->get_key_image((char*) key_ptr,
+				   (part->field->type() == FIELD_TYPE_BLOB) ? 
+				   part->length + HA_KEY_BLOB_LENGTH : part->length);
 	key_ptr+=part->store_length - test(part->null_bit);
 	left_length-=part->store_length;
       }

--- 1.11/mysql-test/r/type_blob.result	Fri Dec 12 22:26:56 2003
+++ 1.12/mysql-test/r/type_blob.result	Mon Jan 12 16:24:48 2004
@@ -601,3 +601,9 @@
 2	Chevy 
 4	Ford
 drop table t1;
+CREATE TABLE t1 ( i int(11) NOT NULL default '0',    c text NOT NULL, PRIMARY KEY  (i), KEY (c(1),c(1)));
+INSERT t1 VALUES (1,''),(2,''),(3,'asdfh'),(4,'');
+select max(i) from t1 where c = '';
+max(i)
+4
+drop table t1;

--- 1.11/mysql-test/t/type_blob.test	Fri Dec 12 22:26:56 2003
+++ 1.12/mysql-test/t/type_blob.test	Mon Jan 12 16:24:42 2004
@@ -312,3 +312,9 @@
 select * from t1 where txt > 'Chevy';
 select * from t1 where txt >= 'Chevy';
 drop table t1;
+CREATE TABLE t1 ( i int(11) NOT NULL default '0',    c text NOT NULL, PRIMARY KEY  (i), KEY (c(1),c(1)));
+INSERT t1 VALUES (1,''),(2,''),(3,'asdfh'),(4,'');
+select max(i) from t1 where c = '';
+drop table t1;
+
+
Thread
bk commit into 4.0 tree (Sinisa:1.1676)sinisa12 Jan