mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
unknown 2004-12-30 19:16:44 +03:00
parent 525242d37f
commit ecf24c66cf
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/count_distinct2.result
View file

@ -116,7 +116,7 @@ count(distinct n)
5000 5000
show status like 'Created_tmp_disk_tables'; show status like 'Created_tmp_disk_tables';
Variable_name Value Variable_name Value
Created_tmp_disk_tables 1 Created_tmp_disk_tables 2
drop table t1; drop table t1;
create table t1 (s text); create table t1 (s text);
flush status; flush status;
@ -125,5 +125,5 @@ count(distinct s)
5000 5000
show status like 'Created_tmp_disk_tables'; show status like 'Created_tmp_disk_tables';
Variable_name Value Variable_name Value
Created_tmp_disk_tables 1 Created_tmp_disk_tables 2
drop table t1; drop table t1;

2
mysql-test/r/temp_table.result
View file

@ -94,6 +94,6 @@ d
2002-10-24 14:50:40 2002-10-24 14:50:40
show status like "created_tmp%tables"; show status like "created_tmp%tables";
Variable_name Value Variable_name Value
Created_tmp_disk_tables 0 Created_tmp_disk_tables 1
Created_tmp_tables 2 Created_tmp_tables 2
drop table t1; drop table t1;

2
sql/item.cc
View file

@ -2269,7 +2269,7 @@ enum_field_types Item::field_type() const
Field *Item::make_string_field(TABLE *table) 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, return new Field_blob(max_length, maybe_null, name, table,
collation.collation); collation.collation);
if (max_length > 0) if (max_length > 0)