Commit ecf24c66 authored by unknown's avatar unknown
Browse files

Removed unnecessary chahges from previous commit(see ChangeSet 1.1761 04/12/30)

parent 525242d3

mysql-test/r/count_distinct2.result

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ count(distinct n) 
5000

show status like 'Created_tmp_disk_tables';

Variable_name	Value

Created_tmp_disk_tables	1

Created_tmp_disk_tables	2

drop table t1;

create table t1 (s text);

flush status;
@@ -125,5 +125,5 @@ count(distinct s) 
5000

show status like 'Created_tmp_disk_tables';

Variable_name	Value

Created_tmp_disk_tables	1

Created_tmp_disk_tables	2

drop table t1;

mysql-test/r/temp_table.result

+1 −1
Original line number Diff line number Diff line
@@ -94,6 +94,6 @@ d 
2002-10-24 14:50:40

show status like "created_tmp%tables";

Variable_name	Value

Created_tmp_disk_tables	0

Created_tmp_disk_tables	1

Created_tmp_tables	2

drop table t1;

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -2269,7 +2269,7 @@ enum_field_types Item::field_type() const 


Field *Item::make_string_field(TABLE *table)

{

  if (max_length > MAX_FIELD_WIDTH)

  if (max_length > CONVERT_IF_BIGGER_TO_BLOB)

    return new Field_blob(max_length, maybe_null, name, table,

                          collation.collation);

  if (max_length > 0)