summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-03-25 01:02:26 +0200
committermonty@donna.mysql.fi <>2001-03-25 01:02:26 +0200
commit5487d7a8c01a5ccce90a63a359562cff1bd95b78 (patch)
tree6191242036b4e9061dfd34fc46bf82677415e532 /sql/sql_select.cc
parent176147cd31e728185b8b5cb4459d9d9afd1623d5 (diff)
downloadmariadb-git-5487d7a8c01a5ccce90a63a359562cff1bd95b78.tar.gz
Fixed bug in send in mysqltest
Removed usage of @r/result as this made life hard when testing different table handlers. Allow concurrent inserts if no update/binary log. Don't remove key_cache at flush tables. Fixed bug in SELECT DISTINCT SUM()...
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 720226033e6..db95214cfa3 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3635,7 +3635,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
in the first 'hidden_null_pack_length' bytes of the row.
*/
null_pack_length-=hidden_null_pack_length;
- keyinfo->key_parts= ((field_count-hidden_field_count)+
+ keyinfo->key_parts= ((field_count-param->hidden_field_count)+
test(null_pack_length));
if (allow_distinct_limit)
{