diff options
author | unknown <monty@hundin.mysql.fi> | 2002-08-17 00:35:51 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-08-17 00:35:51 +0300 |
commit | 96f2e21e99394352ad062ae788e70a17a788f92c (patch) | |
tree | a5bba2df04761e778b4e626fc71182b2708f85ff /sql/gen_lex_hash.cc | |
parent | 7139794e299b9b9f118dbf4a9cddfbb027776983 (diff) | |
download | mariadb-git-96f2e21e99394352ad062ae788e70a17a788f92c.tar.gz |
Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
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
Diffstat (limited to 'sql/gen_lex_hash.cc')
-rw-r--r-- | sql/gen_lex_hash.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index c61a75ab880..bd48c65586a 100644 --- a/sql/gen_lex_hash.cc +++ b/sql/gen_lex_hash.cc @@ -73,15 +73,6 @@ static struct my_option my_long_options[] = 0, 0, 0}, {"version", 'V', "Output version information and exit", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"rnd1", 'r', "Set 1 part of rnd value for hash generator", - (gptr*) &best_t1, (gptr*) &best_t1, 0, GET_ULONG, REQUIRED_ARG, 5075635L, - 0, 0, 0, 0, 0}, - {"rnd2", 'R', "Set 2 part of rnd value for hash generator", - (gptr*) &best_t2, (gptr*) &best_t2, 0, GET_ULONG, REQUIRED_ARG, 1345933L, - 0, 0, 0, 0, 0}, - {"type", 't', "Set type of char table to generate", - (gptr*) &best_type, (gptr*) &best_type, 0, GET_UINT, REQUIRED_ARG, 4, 0, 0, - 0, 0, 0}, { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} }; @@ -478,8 +469,7 @@ int main(int argc,char **argv) int error; MY_INIT(argv[0]); - - start_value=3807640L; /* mode=6971 add=3 type: 0 */ + start_value=7281255L; best_t1=4459515L; best_t2=321142L; best_type=2; /* mode=5953 add=7 type: 0 */ if (get_options(argc,(char **) argv)) exit(1); |