summaryrefslogtreecommitdiff
path: root/plugin
Commit message (Collapse)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-06-062-24/+72
|\ | | | | | | (without InnoDB - all InnoDB changes were ignored)
| * 5.5 mergeSergei Golubchik2013-06-062-24/+72
| |\
| | * MDEV-4516 SELECT from I_S.QUERY_CACHE_INFO produces ER_UNKNOWN_ERROR when ↵Sergei Golubchik2013-05-241-1/+1
| | | | | | | | | | | | | | | | | | query cache size is 0 if qc->try_lock() fails, it's not an error
| | * Fix build on WindowsVladislav Vaintroub2013-04-251-0/+4
| | |
| | * MDEV-260 auditing table accessesSergei Golubchik2013-04-191-24/+65
| | |
* | | Merge 10.0-base -> 10.0unknown2013-05-2815-112/+260
|\ \ \ | |/ /
| * | Merge of patch lp:~ahiguti100/maria/handlersocket-fix-78 by Akira HiguchiMichael Widenius2013-05-1015-112/+260
| | | | | | | | | | | | A bugfix of HandlerSocket is not applied to mariadb yet
* | | 10.0-base mergeSergei Golubchik2013-04-1515-93/+348
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-04-141-6/+6
| |\ \ | | |/
| | * compilation warningsSergei Golubchik2013-04-041-6/+6
| | |
| * | MDEV-4254 Semisync plugins to link statically into MariaDBSergei Golubchik2013-04-095-16/+21
| | | | | | | | | | | | fix semisync plugins and tests to work with both with static and dynamic linking
| * | put status variables in the proper pluginname_ scopeSergei Golubchik2013-04-095-76/+4
| | | | | | | | | | | | | | | (but support the scopeless mysql style too). always output status/system variables in the correct lettercase
| * | 5.5 mergeSergei Golubchik2013-03-275-1/+323
| |\ \ | | |/
| | * MDEV-4307 Support at least 48 utf8 characters in username in server and PAMSergei Golubchik2013-03-262-0/+93
| | | | | | | | | | | | | | | Extend plugin auth api to support up to 512 bytes in the user names. Use the API versioning to support old auth plugins too!
| | * MDEV-249 QUERY CACHE INFORMATIONSergei Golubchik2013-03-202-0/+217
| | |
| | * MDEV-4175 auth_socket to build on OpenBSD / BitrigSergei Golubchik2013-03-081-1/+13
| | |
* | | 10.0-base mergeSergei Golubchik2013-01-311-0/+6
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-01-291-0/+6
| |\ \ | | |/
| | * 5.3 mergeSergei Golubchik2013-01-151-0/+6
| | |\
| | | * 5.2->5.3 mergeSergei Golubchik2013-01-102-0/+9
| | | |\
| | | | * Fix broken feedback plugin after MDEV-712.Vladislav Vaintroub2012-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | Link feedback plugin with yassl libraries, if with-ssl=bundled is used, since mysqld does not export SSL symbols anymore.
| | | | * merge 5.1Vladislav Vaintroub2012-11-221-0/+6
| | | | |\
| | | | | * Feedback plugin now recognizes Windows 8 / Windows Server 2012.Vladislav Vaintroub2012-11-221-0/+6
| | | | | |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-183-19/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-165-34/+129
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-3/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge MariaDB 5.2->5.3unknown2012-11-201-3/+6
| | | |\ \ \ | | | | |/ /
| | | | * | Merge MariaDB 5.1->5.2.unknown2012-11-201-3/+6
| | | | |\ \ | | | | | |/
| | | | | * potential crash in the feedback pluginSergei Golubchik2012-11-191-3/+6
| | | | | |
| | * | | | rename plugin null_audit -> audit_null (to match status variable names)Sergei Golubchik2012-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | create audit_null.test
| | * | | | build feedback plugin with ssl (changes for cmake).Sergei Golubchik2012-11-062-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | fix the ssl related code to use newer function prototypes
* | | | | | merge with 5.5Sergei Golubchik2012-11-032-15/+98
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 5.3 mergeSergei Golubchik2012-10-182-15/+98
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mergeSergei Golubchik2012-09-272-15/+98
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | a simple pam user mapper moduleSergei Golubchik2012-09-252-15/+98
| | | | | |
* | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-196-16/+17
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to avoid calculating variables (including those involving mutex) that doesn't match the given wildcard in SHOW STATUS LIKE '...' Removed all references to active_mi that could cause problems for multi-source replication. Added START|STOP ALL SLAVES Added SHOW ALL SLAVES STATUS include/mysql/plugin.h: Added SHOW_SIMPLE_FUNC include/mysql/plugin_audit.h.pp: Updated .pp file include/mysql/plugin_auth.h.pp: Updated .pp file include/mysql/plugin_ftparser.h.pp: Updated .pp file mysql-test/suite/multi_source/info_logs.result: New columns in SHOW ALL SLAVES STATUS mysql-test/suite/multi_source/info_logs.test: Test new syntax mysql-test/suite/multi_source/simple.result: New columns in SHOW ALL SLAVES STATUS mysql-test/suite/multi_source/simple.test: test new syntax mysql-test/suite/multi_source/syntax.result: Updated result mysql-test/suite/multi_source/syntax.test: Test new syntax mysql-test/suite/rpl/r/rpl_skip_replication.result: Updated result plugin/semisync/semisync_master_plugin.cc: SHOW_FUNC -> SHOW_SIMPLE_FUNC sql/item_create.cc: Simplify code sql/lex.h: Added SLAVES keyword sql/log.cc: Constant -> define sql/log_event.cc: Added comment sql/mysqld.cc: SHOW_FUNC -> SHOW_SIMPLE_FUNC Made slave_retried_trans, slave_received_heartbeats and heartbeat_period multi-source safe Clear variable denied_connections and slave_retried_transactions on startup sql/mysqld.h: Added slave_retried_transactions sql/rpl_mi.cc: create_signed_file_name -> create_logfile_name_with_suffix Added start_all_slaves() and stop_all_slaves() sql/rpl_mi.h: Added prototypes sql/rpl_rli.cc: create_signed_file_name -> create_logfile_name_with_suffix added executed_entries sql/rpl_rli.h: Added executed_entries sql/share/errmsg-utf8.txt: More and better error messages sql/slave.cc: Added more fields to SHOW ALL SLAVES STATUS Added slave_retried_transactions Changed constants -> defines sql/sql_class.h: Added comment sql/sql_insert.cc: active_mi.rli -> thd->rli_slave sql/sql_lex.h: Added SQLCOM_SLAVE_ALL_START & SQLCOM_SLAVE_ALL_STOP sql/sql_load.cc: active_mi.rli -> thd->rli_slave sql/sql_parse.cc: Added START|STOP ALL SLAVES sql/sql_prepare.cc: Added SQLCOM_SLAVE_ALL_START & SQLCOM_SLAVE_ALL_STOP sql/sql_reload.cc: Made REFRESH RELAY LOG multi-source safe sql/sql_repl.cc: create_signed_file_name -> create_logfile_name_with_suffix Don't send my_ok() from start_slave() or stop_slave() so that we can call it for all master connections sql/sql_show.cc: Compare wild cards early for all variables sql/sql_yacc.yy: Added START|STOP ALL SLAVES Added SHOW ALL SLAVES STATUS sql/sys_vars.cc: Made replicate_events_marked_for_skip,slave_net_timeout and rpl_filter multi-source safe. sql/sys_vars.h: Simplify Sys_var_rpl_filter
| * | | | | Automatic merge with 5.5Michael Widenius2012-09-016-7/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed compiler warningsMichael Widenius2012-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed error in test that caused following tests to fail extra/yassl/taocrypt/src/dsa.cpp: Fixed compiler warning by adding cast mysql-test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test: We have to first test for have_debug_sync to not start master wrongly plugin/auth_pam/auth_pam.c: Fixed compiler warning sql/sys_vars.h: Fixed compiler warning (Sys_var_max_user_conn is now signed) support-files/compiler_warnings.supp: Don't give warnings for auth_pam.c (Tried to fix it by changing the code, but could not find an easy way to do that on solaris)
| | * | | | Automatic mergeMichael Widenius2012-08-131-1/+2
| | |\ \ \ \
| | | * | | | Fixed compiler warnings (A few of these was bugs)Michael Widenius2012-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqldump.c: Slave needs to be initialized with 0 dbug/dbug.c: Removed not existing function plugin/semisync/semisync_master.cc: Fixed compiler warning sql/opt_range.cc: thd needs to be set early as it's used in some error conditions. sql/sql_table.cc: Changed to use uchar* to make array indexing portable storage/innobase/handler/ha_innodb.cc: Removed not used variable storage/maria/ma_delete.c: Fixed compiler warning storage/maria/ma_write.c: Fixed compiler warning
| | * | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-094-5/+5
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | manually checked every change, reverted incorrect or stupid changes.
| | | * | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-294-5/+5
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-5.1 to mysql-5.5
* | | | | | | | win fixes in semisync pluginSergei Golubchik2012-10-011-9/+0
| | | | | | | |
* | | | | | | | fixes for test failuresSergei Golubchik2012-09-275-15/+36
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and small collateral changes mysql-test/lib/My/Test.pm: somehow with "print" we get truncated writes sometimes mysql-test/suite/perfschema/r/digest_table_full.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/dml_handler.result: host table is not ported over yet mysql-test/suite/perfschema/r/information_schema.result: host table is not ported over yet mysql-test/suite/perfschema/r/nesting.result: this differs, because we don't rewrite general log queries, and multi-statement packets are logged as a one entry. this result file is identical to what mysql-5.6.5 produces with the --log-raw option. mysql-test/suite/perfschema/r/relaylog.result: MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB. mysql-test/suite/perfschema/r/server_init.result: MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup. mysql-test/suite/perfschema/r/stage_mdl_global.result: this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not do that, and this causes useless mutex locks and waits. mysql-test/suite/perfschema/r/statement_digest.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_consumers.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_long_query.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result: will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result: will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
* | | | | | | Fixed compiler warningsMichael Widenius2012-07-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.cc: Added cast plugin/feedback/utils.cc: Added #ifdef sql/sql_select.cc: Added cast sql/sys_vars.h: Changed limits to int support-files/compiler_warnings.supp: Added suppression
* | | | | | | automatic merge with 5.5Michael Widenius2012-06-271-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-359: Fix another case where switch-off semisync could cause a race that ↵unknown2012-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ended with server crash. This one was when the code releases and reaquires the lock with pthread_cond_wait() - and semisync is switched off meanwhile.
| * | | | | | MDEV-359: Server crash when SET GLOBAL rpl_semi_sync_master_enabled = OFFunknown2012-06-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The semisync code does a fast-but-unsafe check for enabled or not without lock, followed by a slow-but-safe check under lock. However, if the slow check failed, the code still referenced not valid data (in an assert() expression), causing a crash. Fixed by not running the incorrect assert when semisync is disabled.
* | | | | | | Fixed build failures found by buildbotMichael Widenius2012-06-051-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added suppression of warnings - Fixed some test cases BUILD/FINISH.sh: Added AM_EXTRA_MAKEFLAGS BUILD/SETUP.sh: Added option --extra-makeflags client/mysqldump.c: Added suppression mysql-test/r/mysql.result: Updated results mysql-test/r/mysql_upgrade.result: Updated results mysql-test/r/partition_innodb_plugin.result: Updated results mysql-test/r/partition_open_files_limit.result: Updated results mysql-test/r/symlink.result: Updated results mysql-test/suite/innodb/r/innodb-create-options.result: Updated results mysql-test/suite/innodb/t/innodb-create-options.test: Don't print error message (as it's varies on different system) mysql-test/t/mysql.test: Don't print error message (as it's varies on different system) mysql-test/t/mysql_upgrade.test: Fixed checking of error number mysql-test/t/partition_innodb_plugin.test: Don't print error message (as it's varies on different system) plugin/semisync/semisync_master.cc: Added suppression sql/ha_partition.cc: Added suppression sql/item_subselect.cc: Added suppression sql/multi_range_read.cc: Added suppression sql/sql_parse.cc: Added suppression sql/sql_select.cc: Added suppression storage/innobase/handler/ha_innodb.cc: Removed not used variable storage/maria/ma_delete.c: Added suppression storage/maria/ma_key_recover.c: Added suppression storage/maria/ma_write.c: Added suppression strings/ctype-ucs2.c: Added suppression support-files/compiler_warnings.supp: Added suppressions unittest/mysys/my_vsnprintf-t.c: Fixed test case with %M to also work on Solaris
View Lorry Controller Status