mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
a68a9cb693
Add define YASSL_PREFIX when compiling yassl Import patch from yaSSL - avoid allocating memory for each call to 'EVP_md5' and 'EVP_des_ede3_cbc' which were not released until server was stopped - Those functions are used from the SQL function 'des_encrypt' and 'des_decrypt'. Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases - Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1 - Include prefix files that renames all public functions in yaSSLs OpenSSL API to ya<function_name>. They will otherwise conflict with OpenSSL functions if loaded by an application that uses OpenSSL as well as libmysqlclient with yaSSL support. Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c Two threads both try a shutdown sequence which creates a race to the de-init/free of certain resources. This exists in similar form in the client as 17926: "mysql.exe crashes when ctrl-c is pressed in windows." Update after merge to 5.0 BUG#18669: Session COM_STATISTICS breaks mysqladmin status. Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens. - In function 'handle_grant_struct' when searching the memory structures for an entry to modify, convert all entries here host.hostname is NULL to "" and compare that with the host passed in argument "user_from". - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means that "any host" can connect. Thus is's correct to turn on allow_all_hosts when such a user is found. - Review and fix other places where host.hostname may be NULL. BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated Removed duplication (not a user-visible change) client/Makefile.am: Remove $yassl_includes client/mysqltest.c: Turn on ssl_verify_server_cert only if host is "localhost" extra/yassl/include/openssl/crypto.h: Add prefix file for ssl.h extra/yassl/include/openssl/ssl.h: Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_* extra/yassl/include/yassl_int.hpp: Import patch yassl.diff extra/yassl/src/Makefile.am: Add defined YASSL_PREFIX when building yassl/testsuite extra/yassl/src/ssl.cpp: Import patch yassl.diff extra/yassl/src/template_instnt.cpp: Import patch yassl.diff extra/yassl/src/yassl_int.cpp: Import patch yassl.diff extra/yassl/testsuite/Makefile.am: Add defined YASSL_PREFIX when building yassl/testsuite extra/yassl/yassl.vcproj: Add define YASSL_PREFIX when compiling yassl include/violite.h: Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files libmysql/Makefile.am: Remove yassl_includes libmysql_r/Makefile.am: Remove yassl_includes libmysqld/Makefile.am: Remove yassl_includes libmysqld/examples/Makefile.am: Remove yassl_includes mysql-test/r/analyze.result: Add missing drop table mysql-test/r/grant.result: Reorder test result Add test cases for users with hostname "" mysql-test/r/ps.result: Add missing drop table mysql-test/t/analyze.test: Add missing drop table mysql-test/t/grant.test: Add "use test" Add test cases for users with hostname "" - Test create, grant and drop as well as connecting as the user with hostname "". mysql-test/t/ps.test: Add missing drop table server-tools/instance-manager/Makefile.am: Remove yassl_includes sql/Makefile.am: Remove yassl_includes sql/mysqld.cc: We have three potential ways of hitting the iceberg: - unireg_end() has basic de-init - unireg_abort() has extended de-init - main() has a de-init sequence similar to unireg_abort() In the Windows version of the server, Control-C is handled in a different thread from the one main() is in. The main loop is told to end, then unireg_abort() is called. Its de-init and that of main() will then race each other for mutex- and cond-var-destroys, free(), and finally exit(). This patch introduces a special case for Windows that will eliminate the race by ending the signal-handler via unireg_end() instead if SIGINT is signalled. This seems the least intrusive fix that still fixes user-visible behaviour. Two of the startup options for mysqld, innodb_commit_concurrency and innodb_thread_concurrency, were using the same enumeration value. Changed to give innodb_commit_concurrency it's own value. sql/sql_acl.cc: Add check if host is NULL Add check if grant_name->host.hostname is null Convert places where host.hostname is NULL to "" before using it. sql/sql_parse.cc: Calculate and display the global statistics. vio/Makefile.am: Remove yassl_includes extra/yassl/include/openssl/generate_prefix_files.pl: New BitKeeper file ``extra/yassl/include/openssl/generate_prefix_files.pl'' extra/yassl/include/openssl/prefix_crypto.h: New BitKeeper file ``extra/yassl/include/openssl/prefix_crypto.h'' extra/yassl/include/openssl/prefix_ssl.h: New BitKeeper file ``extra/yassl/include/openssl/prefix_ssl.h'' |
||
|---|---|---|
| .. | ||
| share | ||
| .cvsignore | ||
| add_errmsg | ||
| authors.h | ||
| client_settings.h | ||
| CMakeLists.txt | ||
| contributors.h | ||
| custom_conf.h | ||
| derror.cc | ||
| des_key_file.cc | ||
| discover.cc | ||
| event.cc | ||
| event.h | ||
| event_executor.cc | ||
| event_priv.h | ||
| event_scheduler.cc | ||
| event_scheduler.h | ||
| event_timed.cc | ||
| field.cc | ||
| field.h | ||
| field_conv.cc | ||
| filesort.cc | ||
| frm_crypt.cc | ||
| gen_lex_hash.cc | ||
| gstream.cc | ||
| gstream.h | ||
| ha_berkeley.cc | ||
| ha_berkeley.h | ||
| ha_federated.cc | ||
| ha_federated.h | ||
| ha_heap.cc | ||
| ha_heap.h | ||
| ha_innodb.cc | ||
| ha_innodb.h | ||
| ha_myisam.cc | ||
| ha_myisam.h | ||
| ha_myisammrg.cc | ||
| ha_myisammrg.h | ||
| ha_ndbcluster.cc | ||
| ha_ndbcluster.h | ||
| ha_ndbcluster_binlog.cc | ||
| ha_ndbcluster_binlog.h | ||
| ha_ndbcluster_tables.h | ||
| ha_partition.cc | ||
| ha_partition.h | ||
| handler.cc | ||
| handler.h | ||
| hash_filo.cc | ||
| hash_filo.h | ||
| hostname.cc | ||
| init.cc | ||
| item.cc | ||
| item.h | ||
| item_buff.cc | ||
| item_cmpfunc.cc | ||
| item_cmpfunc.h | ||
| item_create.cc | ||
| item_create.h | ||
| item_func.cc | ||
| item_func.h | ||
| item_geofunc.cc | ||
| item_geofunc.h | ||
| item_row.cc | ||
| item_row.h | ||
| item_strfunc.cc | ||
| item_strfunc.h | ||
| item_subselect.cc | ||
| item_subselect.h | ||
| item_sum.cc | ||
| item_sum.h | ||
| item_timefunc.cc | ||
| item_timefunc.h | ||
| item_uniq.cc | ||
| item_uniq.h | ||
| item_xmlfunc.cc | ||
| item_xmlfunc.h | ||
| key.cc | ||
| lex.h | ||
| lex_symbol.h | ||
| lock.cc | ||
| log.cc | ||
| log.h | ||
| log_event.cc | ||
| log_event.h | ||
| Makefile.am | ||
| matherr.c | ||
| message.mc | ||
| mf_iocache.cc | ||
| my_decimal.cc | ||
| my_decimal.h | ||
| my_lock.c | ||
| mysql_priv.h | ||
| mysqld.cc | ||
| mysqld_suffix.h | ||
| net_serv.cc | ||
| nt_servc.cc | ||
| nt_servc.h | ||
| opt_range.cc | ||
| opt_range.h | ||
| opt_sum.cc | ||
| parse_file.cc | ||
| parse_file.h | ||
| partition_element.h | ||
| partition_info.cc | ||
| partition_info.h | ||
| password.c | ||
| procedure.cc | ||
| procedure.h | ||
| protocol.cc | ||
| protocol.h | ||
| records.cc | ||
| repl_failsafe.cc | ||
| repl_failsafe.h | ||
| rpl_filter.cc | ||
| rpl_filter.h | ||
| rpl_injector.cc | ||
| rpl_injector.h | ||
| rpl_rli.h | ||
| rpl_tblmap.cc | ||
| rpl_tblmap.h | ||
| set_var.cc | ||
| set_var.h | ||
| slave.cc | ||
| slave.h | ||
| sp.cc | ||
| sp.h | ||
| sp_cache.cc | ||
| sp_cache.h | ||
| sp_head.cc | ||
| sp_head.h | ||
| sp_pcontext.cc | ||
| sp_pcontext.h | ||
| sp_rcontext.cc | ||
| sp_rcontext.h | ||
| spatial.cc | ||
| spatial.h | ||
| sql_acl.cc | ||
| sql_acl.h | ||
| sql_analyse.cc | ||
| sql_analyse.h | ||
| sql_array.h | ||
| sql_base.cc | ||
| sql_binlog.cc | ||
| sql_bitmap.h | ||
| sql_builtin.cc.in | ||
| sql_cache.cc | ||
| sql_cache.h | ||
| sql_class.cc | ||
| sql_class.h | ||
| sql_client.cc | ||
| sql_crypt.cc | ||
| sql_crypt.h | ||
| sql_cursor.cc | ||
| sql_cursor.h | ||
| sql_db.cc | ||
| sql_delete.cc | ||
| sql_derived.cc | ||
| sql_do.cc | ||
| sql_error.cc | ||
| sql_error.h | ||
| sql_handler.cc | ||
| sql_help.cc | ||
| sql_insert.cc | ||
| sql_lex.cc | ||
| sql_lex.h | ||
| sql_list.cc | ||
| sql_list.h | ||
| sql_load.cc | ||
| sql_manager.cc | ||
| sql_manager.h | ||
| sql_map.cc | ||
| sql_map.h | ||
| sql_olap.cc | ||
| sql_parse.cc | ||
| sql_partition.cc | ||
| sql_partition.h | ||
| sql_plugin.cc | ||
| sql_plugin.h | ||
| sql_prepare.cc | ||
| sql_rename.cc | ||
| sql_repl.cc | ||
| sql_repl.h | ||
| sql_select.cc | ||
| sql_select.h | ||
| sql_show.cc | ||
| sql_show.h | ||
| sql_sort.h | ||
| sql_state.c | ||
| sql_string.cc | ||
| sql_string.h | ||
| sql_table.cc | ||
| sql_tablespace.cc | ||
| sql_test.cc | ||
| sql_trigger.cc | ||
| sql_trigger.h | ||
| sql_udf.cc | ||
| sql_udf.h | ||
| sql_union.cc | ||
| sql_update.cc | ||
| sql_view.cc | ||
| sql_view.h | ||
| sql_yacc.yy | ||
| stacktrace.c | ||
| stacktrace.h | ||
| strfunc.cc | ||
| structs.h | ||
| table.cc | ||
| table.h | ||
| thr_malloc.cc | ||
| time.cc | ||
| tzfile.h | ||
| tztime.cc | ||
| tztime.h | ||
| udf_example.cc | ||
| uniques.cc | ||
| unireg.cc | ||
| unireg.h | ||