diff options
| author | unknown <monty@donna.mysql.fi> | 2001-03-24 20:15:14 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-03-24 20:15:14 +0200 |
| commit | 13a57d19d11333f4fd255725f91256c155b90a12 (patch) | |
| tree | e705394f8291c4c2268717e3fb70734414d0f1d9 /sql/sql_select.cc | |
| parent | 734c846c26cba1dae6a8e1cedc60e33637a14853 (diff) | |
| download | mariadb-git-13a57d19d11333f4fd255725f91256c155b90a12.tar.gz | |
Added defines for fast mutex in glibc 2.2 (should be safe)
Fixed crash in SELECT DISTINCT SUM(...)
Fix return value of mysortncmp() for innobase
Fix join_crash bug
Docs/manual.texi:
Changelog
include/my_pthread.h:
Added defines for fast mutex in glibc 2.2
mysql-test/t/join_crash.test:
Changed table names to t1,t2...
mysys/my_bitmap.c:
Use fast mutex
mysys/my_open.c:
Use fast mutex
mysys/my_pthread.c:
Use fast mutex
mysys/my_thr_init.c:
Use fast mutex
mysys/my_winthread.c:
Use fast mutex
mysys/thr_mutex.c:
Use new mutexattr with error checking
sql/ha_innobase.cc:
Fix return value of mysortncmp() for innobase
sql/sql_select.cc:
Fix join_crash bug
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1aa6d1b8ff3..720226033e6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -712,7 +712,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, } if (tmp_table->distinct) - select_distinct=0; /* Each row is uniq */ + select_distinct=0; /* Each row is unique */ join_free(&join); /* Free quick selects */ if (select_distinct && ! group) @@ -3635,7 +3635,8 @@ 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+ test(null_pack_length); + keyinfo->key_parts= ((field_count-hidden_field_count)+ + test(null_pack_length)); if (allow_distinct_limit) { set_if_smaller(table->max_rows,thd->select_limit); @@ -3673,6 +3674,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, key_part_info->type= HA_KEYTYPE_BINARY; key_part_info++; } + /* Create a distinct key over the columns we are going to return */ for (i=param->hidden_field_count, reg_field=table->field + i ; i < field_count; i++, reg_field++, key_part_info++) |