summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-7652 - More explanatory ERROR and WARNING messages when loading pluginsSergey Vojtovich2015-07-291-4/+11
| | | | | | | | with plugin-load-add that are already registered at mysql.plugin - issue just one error message, without this extra warning - don't abuse ER_UDF_EXISTS, instead add a proper error message for plugins - report started initialization for each plugin source
* Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-20/+5
|\
| * MDEV-363 - Server crashes in intern_plugin_lock on concurrent installingSergey Vojtovich2015-06-091-20/+6
| | | | | | | | | | | | | | | | | | | | | | | | semisync plugin and setting rpl_semi_sync_master_enabled There was race condition between INSTALL PLUGIN and SET. It was caused by a gap in INSTALL PLUGIN when plugin variables were registered but not fully initialized. Accessing such variables concurrently may reference uninitialized memory, specifically sys_var_pluginvar::plugin. Fixed by initializing sys_var_pluginvar::plugin early, before variable is registered.
| * MDEV-363 - Server crashes in intern_plugin_lock on concurrent installingSergey Vojtovich2015-06-091-7/+5
| | | | | | | | | | | | | | | | semisync plugin and setting rpl_semi_sync_master_enabled Cleanup: Removed my_intern_plugin_lock() and my_intern_plugin_lock_ci() wrappers. They were obsoleted by revision f56dd32bf.
* | Allow {un,}install plugins during bootstrap/skip-grant-tablesDaniel Black2015-03-151-14/+2
| | | | | | | | | | | | | | This aids packagers to install/uninstall plugins without starting a full mysql instance. for MDEV-7781.
* | 5.5 mergeSergei Golubchik2015-01-211-1/+1
|\ \ | |/
| * MDEV-7475 Wrong implementation of checking PLUGIN_VAR_SET conditionSergei Golubchik2015-01-191-1/+1
| | | | | | | | correct the check for PLUGIN_VAR_STR
* | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the failure was a bug in an include file on debian that causes 'struct stat' to have different sized depending on the environment. This patch fixes so that we always include my_global.h or my_config.h before we include any other files. Other things: - Removed #include <my_global.h> in some include files; Better to always do this at the top level to have as few "always-include-this-file-first' files as possible. - Removed usage of some include files that where already included by my_global.h or by other files. client/mysql_plugin.c: Use my_global.h first client/mysqlslap.c: Remove duplicated include files extra/comp_err.c: Remove duplicated include files include/m_string.h: Remove duplicated include files include/maria.h: Remove duplicated include files libmysqld/emb_qcache.cc: Use my_global.h first plugin/semisync/semisync.h: Use my_pthread.h first sql/datadict.cc: Use my_global.h first sql/debug_sync.cc: Use my_global.h first sql/derror.cc: Use my_global.h first sql/des_key_file.cc: Use my_global.h first sql/discover.cc: Use my_global.h first sql/event_data_objects.cc: Use my_global.h first sql/event_db_repository.cc: Use my_global.h first sql/event_parse_data.cc: Use my_global.h first sql/event_queue.cc: Use my_global.h first sql/event_scheduler.cc: Use my_global.h first sql/events.cc: Use my_global.h first sql/field.cc: Use my_global.h first Remove duplicated include files sql/field_conv.cc: Use my_global.h first sql/filesort.cc: Use my_global.h first Remove duplicated include files sql/gstream.cc: Use my_global.h first sql/ha_ndbcluster.cc: Use my_global.h first sql/ha_ndbcluster_binlog.cc: Use my_global.h first sql/ha_ndbcluster_cond.cc: Use my_global.h first sql/ha_partition.cc: Use my_global.h first sql/handler.cc: Use my_global.h first sql/hash_filo.cc: Use my_global.h first sql/hostname.cc: Use my_global.h first sql/init.cc: Use my_global.h first sql/item.cc: Use my_global.h first sql/item_buff.cc: Use my_global.h first sql/item_cmpfunc.cc: Use my_global.h first sql/item_create.cc: Use my_global.h first sql/item_geofunc.cc: Use my_global.h first sql/item_inetfunc.cc: Use my_global.h first sql/item_row.cc: Use my_global.h first sql/item_strfunc.cc: Use my_global.h first sql/item_subselect.cc: Use my_global.h first sql/item_sum.cc: Use my_global.h first sql/item_timefunc.cc: Use my_global.h first sql/item_xmlfunc.cc: Use my_global.h first sql/key.cc: Use my_global.h first sql/lock.cc: Use my_global.h first sql/log.cc: Use my_global.h first sql/log_event.cc: Use my_global.h first sql/log_event_old.cc: Use my_global.h first sql/mf_iocache.cc: Use my_global.h first sql/mysql_install_db.cc: Remove duplicated include files sql/mysqld.cc: Remove duplicated include files sql/net_serv.cc: Remove duplicated include files sql/opt_range.cc: Use my_global.h first sql/opt_subselect.cc: Use my_global.h first sql/opt_sum.cc: Use my_global.h first sql/parse_file.cc: Use my_global.h first sql/partition_info.cc: Use my_global.h first sql/procedure.cc: Use my_global.h first sql/protocol.cc: Use my_global.h first sql/records.cc: Use my_global.h first sql/records.h: Don't include my_global.h Better to do this at the upper level sql/repl_failsafe.cc: Use my_global.h first sql/rpl_filter.cc: Use my_global.h first sql/rpl_gtid.cc: Use my_global.h first sql/rpl_handler.cc: Use my_global.h first sql/rpl_injector.cc: Use my_global.h first sql/rpl_record.cc: Use my_global.h first sql/rpl_record_old.cc: Use my_global.h first sql/rpl_reporting.cc: Use my_global.h first sql/rpl_rli.cc: Use my_global.h first sql/rpl_tblmap.cc: Use my_global.h first sql/rpl_utility.cc: Use my_global.h first sql/set_var.cc: Added comment sql/slave.cc: Use my_global.h first sql/sp.cc: Use my_global.h first sql/sp_cache.cc: Use my_global.h first sql/sp_head.cc: Use my_global.h first sql/sp_pcontext.cc: Use my_global.h first sql/sp_rcontext.cc: Use my_global.h first sql/spatial.cc: Use my_global.h first sql/sql_acl.cc: Use my_global.h first sql/sql_admin.cc: Use my_global.h first sql/sql_analyse.cc: Use my_global.h first sql/sql_audit.cc: Use my_global.h first sql/sql_base.cc: Use my_global.h first sql/sql_binlog.cc: Use my_global.h first sql/sql_bootstrap.cc: Use my_global.h first Use my_global.h first sql/sql_cache.cc: Use my_global.h first sql/sql_class.cc: Use my_global.h first sql/sql_client.cc: Use my_global.h first sql/sql_connect.cc: Use my_global.h first sql/sql_crypt.cc: Use my_global.h first sql/sql_cursor.cc: Use my_global.h first sql/sql_db.cc: Use my_global.h first sql/sql_delete.cc: Use my_global.h first sql/sql_derived.cc: Use my_global.h first sql/sql_do.cc: Use my_global.h first sql/sql_error.cc: Use my_global.h first sql/sql_explain.cc: Use my_global.h first sql/sql_expression_cache.cc: Use my_global.h first sql/sql_handler.cc: Use my_global.h first sql/sql_help.cc: Use my_global.h first sql/sql_insert.cc: Use my_global.h first sql/sql_lex.cc: Use my_global.h first sql/sql_load.cc: Use my_global.h first sql/sql_locale.cc: Use my_global.h first sql/sql_manager.cc: Use my_global.h first sql/sql_parse.cc: Use my_global.h first sql/sql_partition.cc: Use my_global.h first sql/sql_plugin.cc: Added comment sql/sql_prepare.cc: Use my_global.h first sql/sql_priv.h: Added error if we use this before including my_global.h This check is here becasue so many files includes sql_priv.h first. sql/sql_profile.cc: Use my_global.h first sql/sql_reload.cc: Use my_global.h first sql/sql_rename.cc: Use my_global.h first sql/sql_repl.cc: Use my_global.h first sql/sql_select.cc: Use my_global.h first sql/sql_servers.cc: Use my_global.h first sql/sql_show.cc: Added comment sql/sql_signal.cc: Use my_global.h first sql/sql_statistics.cc: Use my_global.h first sql/sql_table.cc: Use my_global.h first sql/sql_tablespace.cc: Use my_global.h first sql/sql_test.cc: Use my_global.h first sql/sql_time.cc: Use my_global.h first sql/sql_trigger.cc: Use my_global.h first sql/sql_udf.cc: Use my_global.h first sql/sql_union.cc: Use my_global.h first sql/sql_update.cc: Use my_global.h first sql/sql_view.cc: Use my_global.h first sql/sys_vars.cc: Added comment sql/table.cc: Use my_global.h first sql/thr_malloc.cc: Use my_global.h first sql/transaction.cc: Use my_global.h first sql/uniques.cc: Use my_global.h first sql/unireg.cc: Use my_global.h first sql/unireg.h: Removed inclusion of my_global.h storage/archive/ha_archive.cc: Added comment storage/blackhole/ha_blackhole.cc: Use my_global.h first storage/csv/ha_tina.cc: Use my_global.h first storage/csv/transparent_file.cc: Use my_global.h first storage/federated/ha_federated.cc: Use my_global.h first storage/federatedx/federatedx_io.cc: Use my_global.h first storage/federatedx/federatedx_io_mysql.cc: Use my_global.h first storage/federatedx/federatedx_io_null.cc: Use my_global.h first storage/federatedx/federatedx_txn.cc: Use my_global.h first storage/heap/ha_heap.cc: Use my_global.h first storage/innobase/handler/handler0alter.cc: Use my_global.h first storage/maria/ha_maria.cc: Use my_global.h first storage/maria/unittest/ma_maria_log_cleanup.c: Remove duplicated include files storage/maria/unittest/test_file.c: Added comment storage/myisam/ha_myisam.cc: Move sql_plugin.h first as this includes my_global.h storage/myisammrg/ha_myisammrg.cc: Use my_global.h first storage/oqgraph/oqgraph_thunk.cc: Use my_config.h and my_global.h first One could not include my_global.h before oqgraph_thunk.h (don't know why) storage/spider/ha_spider.cc: Use my_global.h first storage/spider/hs_client/config.cpp: Use my_global.h first storage/spider/hs_client/escape.cpp: Use my_global.h first storage/spider/hs_client/fatal.cpp: Use my_global.h first storage/spider/hs_client/hstcpcli.cpp: Use my_global.h first storage/spider/hs_client/socket.cpp: Use my_global.h first storage/spider/hs_client/string_util.cpp: Use my_global.h first storage/spider/spd_conn.cc: Use my_global.h first storage/spider/spd_copy_tables.cc: Use my_global.h first storage/spider/spd_db_conn.cc: Use my_global.h first storage/spider/spd_db_handlersocket.cc: Use my_global.h first storage/spider/spd_db_mysql.cc: Use my_global.h first storage/spider/spd_db_oracle.cc: Use my_global.h first storage/spider/spd_direct_sql.cc: Use my_global.h first storage/spider/spd_i_s.cc: Use my_global.h first storage/spider/spd_malloc.cc: Use my_global.h first storage/spider/spd_param.cc: Use my_global.h first storage/spider/spd_ping_table.cc: Use my_global.h first storage/spider/spd_sys_table.cc: Use my_global.h first storage/spider/spd_table.cc: Use my_global.h first storage/spider/spd_trx.cc: Use my_global.h first storage/xtradb/handler/handler0alter.cc: Use my_global.h first storage/xtradb/handler/i_s.cc: Use my_global.h first
* | 5.5.39 mergeSergei Golubchik2014-08-071-1/+1
|\ \ | |/
| * MDEV-6351 - --plugin=force has no effect for built-in pluginsSergey Vojtovich2014-06-171-1/+1
| | | | | | | | | | mysqld didn't fail to start if a compiled-in plugin failed to initialize (--xxx=FORCE behaving as --xxx=ON)
| * MDEV-6083 - Assertion `! (&(&LOCK_open)->m_mutex)->count ||Sergey Vojtovich2014-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ! pthread_equal(pth read_self(), (&(&LOCK_open)->m_mutex)->thread)' fails in intern_sys_var_ptr on server shutdown after uninstalling TokuDB plugin at runtime This assertion was introduced by patch for MDEV-5089 to ensure proper lock order among LOCK_open and LOCK_global_system_variables: LOCK_open must not be held while acquiring LOCK_global_system_variables. intern_sys_var_ptr() may be called while freeing storage engine variables with PLUGIN_VAR_MEMALLOC flag (when destroying table share after storage engine was uninstalled). In this case LOCK_open is held, which is harmless because we need global value pointer and thus won't acquire LOCK_global_system_variables. Relaxed assertion so it is valid only for session variables.
* | MDEV-6543 Crash if enable 'federatedx' when 'federated' plugin already ↵Sergei Golubchik2014-08-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | enabled, and vice-versa INSTALL SONAME ignores attempts to load the same plugin twice, it's not an error (because one can load one plugin by name and then install soname for the rest). But Federated and FederatedX are different plugins, despite having the same name. Now plugin_add() only considers two plugins identical if their names are the same string (compared as pointers). Otherwise it reports an error.,
* | Coding style fixes: remove trailing spaces.Sergey Vojtovich2014-07-091-5/+5
| |
* | 5.5 mergeSergei Golubchik2014-05-091-4/+10
|\ \ | |/
| * Make THDVAR_INT variables to be signed in SELECT in SHOWSergei Golubchik2014-04-091-4/+10
| |
| * MDEV-5089 - possible deadlocks between rwlocks and mutexesSergey Vojtovich2014-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre-MDL versions had direct relationship between LOCK_open and LOCK_global_system_variables, e.g.: intern_sys_var_ptr // locks LOCK_global_system_variable mysql_sys_var_char create_options_are_valid ha_innobase::create handler::ha_create ha_create_table rea_create_table mysql_create_table_no_lock // locks LOCK_open mysql_create_table With MDL this relationship was removed, but mutex order was still recorded. In fact there is indirect relationship between LOCK_open and LOCK_global_system_variables via rwlocks in reverse order. Removed LOCK_open and LOCK_global_system_variables order recording, instead assert that LOCK_open is never held in intern_sys_var_ptr(). This solves only one of many problems detected with MDEV-5089.
* | 10.0-base mergeSergei Golubchik2014-02-261-2/+12
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-251-2/+12
| |\ \ | | |/
| | * At --log-warnings=9 or more, log at what address a dynamic plugin was loaded.Sergei Golubchik2014-02-171-0/+10
| | | | | | | | | | | | | | | It helps to interpret valgrind/safemalloc memory-related warnings that are printed when a plugin is unloaded (and thus cannot resolve addresses automatically)
| | * MySQL-5.5.36 mergeSergei Golubchik2014-02-171-2/+2
| | |\ | | | | | | | | | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| | | |
* | | | 10.0-base mergeSergei Golubchik2014-02-031-79/+72
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-02-011-77/+72
| |\ \ \ | | |/ /
| | * | MDEV-5345 - Deadlock between mysql_change_user(), SHOW VARIABLES andSergey Vojtovich2014-01-281-77/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INSTALL PLUGIN There was mixed lock order between LOCK_plugin, LOCK_global_system_variables and LOCK_system_variables_hash. This patch ensures that write-lock on LOCK_system_variables_hash doesn't intersect with LOCK_plugin. Fixed by moving initialization/deinitialization of plugin options from plugin_add()/plugin_del() to plugin_initialize()/plugin_deinitalize(). So that plugin options are handled without protection of LOCK_plugin.
| | * | backport from 10.0: "bugfix: MYSQL_THDVAR_STR plugins with ↵Sergei Golubchik2013-12-121-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | PLUGIN_VAR_MEMALLOC didn't work (PLUGIN_VAR_MEMALLOC is 0x8000 and cannot be saved in a char as such)"
* | | | add a forgotten my_afree() to make valgrind happySergei Golubchik2013-12-121-0/+1
| | | |
* | | | remove sys_var specific restore_pluginvar_names() function,Sergei Golubchik2013-12-091-65/+73
| | | | | | | | | | | | | | | | use generic restore_ptr_backup() approach
* | | | MDEV-4403 Attempting to use cassandra storage engine causes "service ↵Sergei Golubchik2013-12-091-3/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'my_snprintf_service' interface version mismatch" When a DSO is loaded we rewrite service pointers to point to the actual service structures. But when a DSO is unloaded, we have to restore their original values, in case this DSO wasn't removed from memory on dlclose() and is later loaded again.
* | | | 10.0-base mergeSergei Golubchik2013-11-131-5/+5
|\ \ \ \ | |/ / /
| * | | 5.5. mergeSergei Golubchik2013-11-131-4/+4
| |\ \ \ | | |/ /
| | * | MDEV-5022 Strange message or wrong errno on mismatching versions of plugin ↵Sergei Golubchik2013-11-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and server 1. use an appropriate errno code 2. put a comma between the errno and the error message text
* | | | 10.0-base merge.Sergei Golubchik2013-09-211-2/+66
|\ \ \ \ | |/ / / | | | | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-5/+72
| |\ \ \ | | |/ /
| | * | merge with 5.5-tokudb tree. In particular:Sergei Golubchik2013-09-101-2/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add TokuDB, together with the ft-index library * cmake support, auto-detecting whether tokudb can be built * fix packaging - tokudb-engine.rpm, deb * remove PBXT * add jemalloc * the server is built with jemalloc by default even if TokuDB is not built * documentation files in RPM are installed in the correct location * support for optional deb packages (tokudb has specific build requirements) * move plugins from mariadb-server deb to appropriate debs (server/test/libmariadbclient) * correct mariadb-test.deb to be not architecture-independent * fix out-of-tree builds to never modify in-tree files * new handler::prepare_index_scan() method
| | | * | remove PBXTSergei Golubchik2013-08-301-2/+1
| | | | |
| | * | | MDEV-4472 Audit-plugin. Server-related part of the task.Alexey Botchkov2013-09-091-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file_logger became the service. Data like query_id now are sent to the audit plugin. Fix for MDEV-4770 ported from 10.0. Fix added for the read_maria_plugin_info(). Log rotation can be disabled with 'set rotations=0'.
| | * | | mysql-5.5.33 mergeSergei Golubchik2013-09-061-0/+61
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLESAshish Agarwal2013-05-191-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | USING THE PLUGIN INTERFACE. ISSUE: No support for floating-point plugin system variables. SOLUTION: Allowing plugins to define and expose floating-point system variables of type double. MYSQL_SYSVAR_DOUBLE and MYSQL_THDVAR_DOUBLE are added. ISSUE: Fractional part of the def, min, max values of system variables are ignored. SOLUTION: Adding functions that are used to store the raw representation of a double in the raw bits of unsigned longlong in a way that the binary representation remains the same.
| | | * BUG#14485479: INSTALL AUDIT PLUGIN HANGS IF WE TRY TOAshish Agarwal2012-10-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DISABLE AND ENABLED DURING DDL OPERATION PROBLEM: Same thread trying to acquire the same mutex second time leads to hang/server crash. While [un]installing audit_log plugin a thread acquires the LOCK_plugin mutex and after successful initialization tries to write in mysql.plugin table. It holds this mutex for a long time. If some how plugin table is corrupted then a write to plugin table will throw an error, thread try to log this error in the audit_log plugin, doing so it tries to acquire the mutex again and results is server hang/crash. SOLUTION: Releasing the LOCK_plugin mutex before writing in mysql.plugin table. We dont need to hold this mutex as thread already acquired a TL_WRITE lock on mysql.plugin table.
* | | | MDEV-4865 Change related to --log option/variable was merged partiallySergei Golubchik2013-08-131-9/+0
| | | | | | | | | | | | | | | | | | | | Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk (WL#5185 Remove deprecated 5.1 features)
* | | | MDEV-4801 - Server crashes in my_strdup on settingSergey Vojtovich2013-08-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innodb_ft_user_stopword_table to DEFAULT Setting plugin string variable with PLUGIN_VAR_MEMALLOC flag to NULL causes server crash. mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result: Reset innodb_ft_user_stopword_table. Also tests MDEV-4801. mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test: Reset innodb_ft_user_stopword_table. Also tests MDEV-4801. sql/sql_plugin.cc: When we got NULL value, do not strdup(NULL).
* | | | 10.0-monty mergeSergei Golubchik2013-07-211-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
| * | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-3/+3
| | | | |
| * | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-1/+1
| | | | |
* | | | | 10.0-base mergeSergei Golubchik2013-07-181-4/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 5.5 mergeSergei Golubchik2013-07-171-4/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MDEV-4529 Assertion `tmp->state == 4' fails on mix of INSTALL SONAME / ↵Sergei Golubchik2013-06-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UNINSTALL PLUGIN fix incorrect assert
| | * | | MDEV-4573 UNINSTALL PLUGIN misleading error message for non-dynamic pluginsSergei Golubchik2013-06-131-3/+1
| | | | | | | | | | | | | | | | | | | | change WARN_PLUGIN_DELETE_BUILTIN to ER_PLUGIN_DELETE_BUILTIN
* | | | | Fixing the problem with my_bool_t defined two times.Alexander Barkov2013-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (it worked fine with the modern gcc, but failed on some other compilers). modified: include/my_global.h include/mysql/plugin.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/service_thd_timezone.h sql/item_func.cc sql/mysqld.cc sql/set_var.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_show.cc sql/sys_vars.cc storage/perfschema/ha_perfschema.cc
* | | | | 10.0-base mergeSergei Golubchik2013-04-151-114/+165
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |