mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 00:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity
87,168 commits 3,537 branches 376 tags 1.7 GiB
Commit graph

342 commits

Author SHA1 Message Date
Sergei Golubchik
d28d3ba40d 10.0-base merge 2013-12-16 13:02:21 +01:00
Sergei Golubchik
6bf10fac44 5.5 merge 2013-12-15 15:57:26 +01:00
Sergey Vojtovich
258bf32d3c MDEV-4748 - metadata_lock_info plugin 
- include metadata_lock_info plugin into debian packages
- ignore metadata_lock_info plugin in mysqld--help test
- let test suite run with built-in metadata_lock_info plugin
 2013-12-13 12:42:45 +04:00
Kentoku SHIBA
3771e14ea9 add metadata_lock_info 2013-12-11 00:31:04 +09:00
Sergei Golubchik
07d3fc5220 MDEV-201 - Assertion `!thd->spcont' failed in net_send_error on server shutdown 
restore sergii@pisem.net-20120327141644-xue6r05x1giswwsm
that was lost in a merge
 2013-11-10 17:51:26 +01:00
Alexander Barkov
a9240dce9e Merge 10.0-base -> 10.0 2013-10-15 10:26:08 +04:00
Alexander Barkov
1a3bb9487d A follow-up for the previous commit: 
MDEV-4425 Regexp enhancements
Adding ${CMAKE_BINARY_DIR}/pcre into search path for *.h files.
Needed for find pcre.h (which is generated from pcre.h.in) when
build directory != source directory.
 2013-10-02 15:41:15 +04:00
Alexander Barkov
285e7aa179 MDEV-4425 REGEXP enhancements 2013-09-26 18:02:17 +04:00
unknown
9d83468e78 merge 5.5 -> 10.0-base 2013-09-25 21:07:06 +03:00
unknown
e5746665c9 merge 10.0-base -> 10.0 2013-09-26 21:20:15 +03:00
Sergei Golubchik
9af177042e 10.0-base merge. 
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
 2013-09-21 10:14:42 +02:00
Sergei Golubchik
4ec2e9d7ed 5.5 merge and fixes for compiler/test errors 2013-09-18 13:07:31 +02:00
Vladislav Vaintroub
b0d98371b9 Update feedback plugin to recognize Windows 8.1 / Windows Server 2012 R2. 2013-09-20 14:37:30 +02:00
Sergei Golubchik
42f56557f5 MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error in include/my_global.h 
C++ comments in C files, and a typo in my_global.h
 2013-09-09 19:31:29 +02:00
Alexey Botchkov
92265da9d7 MDEV-4472 Audit-plugin. Server-related part of the task. 
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'.
 2013-09-09 16:56:35 +05:00
Vladislav Vaintroub
078388f39c MDEV-4926: Remove division-using-subtraction implementation from semi-sync plugin 
If rpl_semi_sync_master_timeout is large, calculation of absolute waiting time in semi-sync plugin is inefficient. This error is specific to systems with 64 bit long values (all 64 bit Unixes)
In  rpl_semi_sync_master_timeout has maximal value (= MAX_ULONGLONG), calculating abstime may require  ~ 18 billion subtract operations.

The fix is to use division instead of subtraction-in-a-loop. Also fixed an integer overflow bug.
 2013-09-03 22:45:12 +02:00
Sergey Vojtovich
5845b83d18 MDEV-4786 - merge 10.0-monty - 10.0 
Fixed query_response_time build failure.

plugin/query_response_time/query_response_time.cc:
  my_atomic_rwlock_rdlock() may update time_collector_lock structure.
  Remove const modifier from relevant methods.
 2013-07-26 13:04:59 +04:00
Sergei Golubchik
b7b5f6f1ab 10.0-monty merge 
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
 2013-07-21 16:39:19 +02:00
Sergei Golubchik
5f6380adde 10.0-base merge 2013-07-18 16:46:57 +02:00
Sergei Golubchik
97e640b9ae 5.5 merge 2013-07-17 21:24:29 +02:00
Sergei Golubchik
005c7e5421 mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
Alexander Barkov
c51ed128b0 Merge from 5.3 2013-07-10 02:05:06 +04:00
Alexander Barkov
8a732d5a5e Merge from 5.2 
modified:
  mysql-test/suite/plugins/r/fulltext_plugin.result
  mysql-test/suite/plugins/t/fulltext_plugin.test
  plugin/fulltext/plugin_example.c
  sql/sql_show.cc
pending merges:
  Alexander Barkov 2013-07-09 [merge] Merge from 5.1
    Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninst...
    Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
 2013-07-09 11:02:56 +04:00
Alexander Barkov
762d3cb8ed Merge from 5.1 
modified:
  mysql-test/suite/plugins/r/fulltext_plugin.result
  mysql-test/suite/plugins/t/fulltext_plugin.test
  plugin/fulltext/plugin_example.c
  sql/sql_show.cc
pending merges:
  Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninstall ...
    Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
 2013-07-09 10:54:47 +04:00
Sergei Golubchik
48b403cd65 Bug #69682 - mysqld crashes after uninstall of plugin with "first" status var 2013-07-06 15:28:11 +02:00
Sergei Golubchik
e8ab897fca MDEV-4617 PLUGINS - Show internal Locales in I_S 
INFORMATION_SCHEMA.LOCALES plugin.
Contribution by Roberto Spadim
 2013-06-24 20:56:30 +02:00
Sergei Golubchik
7c61679c4e MDEV-4685 Compile error on LFS 
fix the code to compile w/o perfomance schema
 2013-06-22 14:02:03 +02:00
Michael Widenius
5f1f2fc0e4 Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
Sergey Vojtovich
b4142fdae3 MDEV-4568 - Port Percona response time distribution as audit plugin 
Minor modification to trigger buildbot.
 2013-06-14 12:10:59 +04:00
Sergei Golubchik
f722b15dc2 MDEV-4636 use mysql_cleartext_plugin from auth_pam 
add a new command-line option --pam-use-cleartext-plugin
 2013-06-11 12:53:35 +02:00
Sergey Vojtovich
fb1a8f04ea Merge. 2013-06-07 12:10:45 +04:00
Sergei Golubchik
72ba95873a 10.0-base merge 
(without InnoDB - all InnoDB changes were ignored)
 2013-06-06 21:32:29 +02:00
Sergei Golubchik
4749d40c63 5.5 merge 2013-06-06 17:51:28 +02:00
Sergey Vojtovich
7f58eb4f79 MDEV-4568 - Port Percona response time distribution as audit plugin 
Test case fixes.
 2013-06-06 12:01:09 +04:00
Sergey Vojtovich
ccdfeb04d8 MDEV-4568 - Port Percona response time distribution as audit plugin 
Test fixes.
 2013-06-05 13:38:41 +04:00
Sergey Vojtovich
afd134e212 MDEV-4568 - Port Percona response time distribution as audit plugin 
sql/sp_head.cc:
  Trigger MYSQL_AUDIT_GENERAL_STATUS event for each statement in stored
  procedures. Not strictly needed for query_response_time plugin, but
  makes it behave more like Percona patch.
 2013-06-04 10:01:31 +04:00
unknown
a0fd7382bc Merge 10.0-base -> 10.0 2013-05-28 15:39:56 +02:00
Sergei Golubchik
9bc4c4183d MDEV-4516 SELECT from I_S.QUERY_CACHE_INFO produces ER_UNKNOWN_ERROR when query cache size is 0 
if qc->try_lock() fails, it's not an error
 2013-05-24 14:33:04 +02:00
Michael Widenius
3143ad589a Push a lot of small fixes to get larger parts to compile 2013-05-21 22:00:08 +03:00
Michael Widenius
7202c21b34 Merge of patch lp:~ahiguti100/maria/handlersocket-fix-78 by Akira Higuchi 
A bugfix of HandlerSocket is not applied to mariadb yet
 2013-05-10 16:01:38 +03:00
Vladislav Vaintroub
1d130cc697 Fix build on Windows 2013-04-25 15:11:59 +02:00
Sergei Golubchik
b9b3d5330a MDEV-260 auditing table accesses 2013-04-19 12:50:16 +02:00
Sergei Golubchik
a9035be5b7 10.0-base merge 2013-04-15 15:09:22 +02:00
Sergei Golubchik
f57ecb7786 5.5 merge 2013-04-14 10:04:07 +02:00
Sergei Golubchik
0d25ee4f13 MDEV-4254 Semisync plugins to link statically into MariaDB 
fix semisync plugins and tests to work with both with static and dynamic linking
 2013-04-09 23:28:21 +02:00
Sergei Golubchik
775e82638b put status variables in the proper pluginname_ scope 
(but support the scopeless mysql style too).
always output status/system variables in the correct lettercase
 2013-04-09 23:27:33 +02:00
Sergei Golubchik
5d4ba5589d compilation warnings 2013-04-04 11:37:23 +02:00
Sergei Golubchik
993ea79f2d 5.5 merge 2013-03-27 23:41:02 +01:00
Sergei Golubchik
102a7a2a76 MDEV-4307 Support at least 48 utf8 characters in username in server and PAM 
Extend plugin auth api to support up to 512 bytes in the user names.
Use the API versioning to support old auth plugins too!
 2013-03-26 19:17:26 +01:00
Sergei Golubchik
01fd55ccae MDEV-249 QUERY CACHE INFORMATION 2013-03-20 20:56:14 +01:00