diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-29 17:25:23 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-29 17:25:23 +0200 |
| commit | 8aec636ba82f3544a8f157ba93cc81570c4ec6d4 (patch) | |
| tree | ff98751356d1d8efd5d39454189c006ce366502d /sql/sql_select.cc | |
| parent | b67ff612d3d17d6806d1f85f2c4b7b5c6d1e3800 (diff) | |
| parent | 9c3a2a0d8e492f6595d82290fc17f2279dd9707a (diff) | |
| download | mariadb-git-8aec636ba82f3544a8f157ba93cc81570c4ec6d4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index bcd7e8c4a9d..03fbb3d5314 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9320,7 +9320,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) ? |