database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)

Browse Source 
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column.
Fixed bug in pthread_mutex_trylock with HPUX 11.0


Docs/manual.texi:
  Changelog
include/my_pthread.h:
  Fix for pthread_mutex_trylock when used with SAFEMUTEX
include/violite.h:
  Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
innobase/buf/buf0buf.c:
  Fixed wrong format string
libmysqld/lib_sql.cc:
  Fixed hangup in embedded server.
mysql-test/r/distinct.result:
  Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
mysql-test/t/distinct.test:
  Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
mysys/my_pthread.c:
  Cleanup of pthread_xxx rewrite code.
  Fixed bug in pthread_mutex_trylock with HPUX 11.0
sql/gen_lex_hash.cc:
  Smaller hash array
sql/mysqld.cc:
  Fixed hangup in embedded server.
sql/sql_select.cc:
  Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
vio/vio.c:
  Added vio_ssl_blocking
vio/viossl.c:
  Added vio_ssl_blocking
This commit is contained in:
unknown
2002-08-17 00:35:51 +03:00
parent 7139794e29
commit 96f2e21e99
13 changed files with 121 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -641,6 +641,8 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
DBUG_PRINT("info",("Creating tmp table"));
thd->proc_info="Creating tmp table";
join.tmp_table_param.hidden_field_count=(all_fields.elements-
fields.elements);
if (!(tmp_table =
create_tmp_table(thd,&join.tmp_table_param,all_fields,
((!simple_group && !procedure &&
@ -3862,6 +3864,8 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
'param->hidden_field_count' extra columns, whose null bits are stored
in the first 'hidden_null_pack_length' bytes of the row.
*/
DBUG_PRINT("info",("hidden_field_count: %d", param->hidden_field_count));
null_pack_length-=hidden_null_pack_length;
keyinfo->key_parts= ((field_count-param->hidden_field_count)+
test(null_pack_length));
@ -3884,7 +3888,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
goto err;
table->key_info=keyinfo;
keyinfo->key_part=key_part_info;
keyinfo->flags=HA_NOSAME|HA_NULL_ARE_EQUAL;
keyinfo->flags=HA_NOSAME | HA_NULL_ARE_EQUAL;
keyinfo->key_length=(uint16) reclength;
keyinfo->name=(char*) "tmp";
if (null_pack_length)