Commit bf8f321e authored by unknown's avatar unknown
Browse files

ha_innodb.cc: 

  Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries


sql/ha_innodb.cc:
  Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries
parent cd12c26a

sql/ha_innodb.cc

+18 −0
Original line number Diff line number Diff line
@@ -2440,6 +2440,13 @@ ha_innobase::store_key_val_for_row( 
				+ (ulint)get_field_offset(table, field)),

				lenlen);



			/* In a column prefix index, we may need to truncate

			the stored value: */

		

			if (len > key_part->length) {

			        len = key_part->length;

			}



			/* The length in a key value is always stored in 2

			bytes */
@@ -2476,6 +2483,11 @@ ha_innobase::store_key_val_for_row( 


			ut_a(get_field_offset(table, field)

						     == key_part->offset);



			/* All indexes on BLOB and TEXT are column prefix

			indexes, and we may need to truncate the data to be

			stored in the kay value: */



			if (blob_len > key_part->length) {

			        blob_len = key_part->length;

			}
@@ -2494,11 +2506,17 @@ ha_innobase::store_key_val_for_row( 


			buff += key_part->length;

		} else {

			/* Here we handle all other data types except the

			true VARCHAR, BLOB and TEXT. Note that the column

			value we store may be also in a column prefix

			index. */



		        if (is_null) {

				 buff += key_part->length;

				 

				 continue;

			}



			memcpy(buff, record + key_part->offset,

							key_part->length);

			buff += key_part->length;