summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authormonty@mysql.com/nosik.monty.fi <>2006-11-28 00:47:21 +0200
committermonty@mysql.com/nosik.monty.fi <>2006-11-28 00:47:21 +0200
commit9c3a2a0d8e492f6595d82290fc17f2279dd9707a (patch)
tree6f911f150de38ce4738b30731deaf7bab1ad02d1 /sql/sql_select.cc
parent501333f694a0aaeeae1e9b0b8b5019d8c6357905 (diff)
downloadmariadb-git-9c3a2a0d8e492f6595d82290fc17f2279dd9707a.tar.gz
Increased heap max length to > 4G for 64 bit machines
Initialize key_part->type on open. This caused key_copy() to fail for bit_fields. (key_copy is used in HANDLER and opt_range)
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 1d89cac584a..4758371f2e0 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -9254,7 +9254,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
param->recinfo=recinfo;
store_record(table,s->default_values); // Make empty default record
- if (thd->variables.tmp_table_size == ~(ulong) 0) // No limit
+ if (thd->variables.tmp_table_size == ~ (ulonglong) 0) // No limit
table->s->max_rows= ~(ha_rows) 0;
else
table->s->max_rows= (((table->s->db_type == DB_TYPE_HEAP) ?