summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-7110 : Add missing MySQL variable log_bin_basename and log_bin_indexbb-10.1-mdev7110Nirbhay Choubey2015-06-0535-14/+614
| | | | | | | Add log_bin_index, log_bin_basename and relay_log_basename system variables. Also, convert relay_log_index system variable to NO_CMD_LINE and implement --relay-log-index as a command line option.
* MDEV-8250: InnoDB: Page compressed tables are not compressed and ↵Jan Lindström2015-06-0421-409/+569
| | | | | | | | | | | | | | | | | | | | | | compressed+encrypted tables cause crash Analysis: Problem is that both encrypted tables and compressed tables use FIL header offset FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION to store required metadata. Furhermore, for only compressed tables currently code skips compression. Fixes: - Only encrypted pages store key_version to FIL header offset FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION, no need to fix - Only compressed pages store compression algorithm to FIL header offset FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION, no need to fix as they have different page type FIL_PAGE_PAGE_COMPRESSED - Compressed and encrypted pages now use a new page type FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED and key_version is stored on FIL header offset FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION and compression method is stored after FIL header similar way as compressed size, so that first FIL_PAGE_COMPRESSED_SIZE is stored followed by FIL_PAGE_COMPRESSION_METHOD - Fix buf_page_encrypt_before_write function to really compress pages if compression is enabled - Fix buf_page_decrypt_after_read function to really decompress pages if compression is used - Small style fixes
* fix for 32-bit testsmariadb-10.1.5Sergei Golubchik2015-06-032-235/+214
|
* AES-GCM support in file_key_management pluginSergei Golubchik2015-06-022-1/+32
|
* my_aes_encrypt_gcm() and my_aes_decrypt_gcm()Sergei Golubchik2015-06-024-3/+103
|
* my_aes_get_size()Sergei Golubchik2015-06-024-11/+13
| | | | | return unsigned, not signed. return a value large enough for GCM
* file_key_management plugin: complain if key id 1 is not foundSergei Golubchik2015-06-024-2/+46
| | | | and don't recommend aes_ctr if it's unavailable
* just like tempfiles: use key id 2 for temp Aria tablesSergei Golubchik2015-06-025-9/+32
| | | | | introduce ENCRYPTION_KEY_SYSTEM_DATA and ENCRYPTION_KEY_TEMPORARY_DATA constants; use them everywhere.
* MDEV-8126 encryption for temp filesSergei Golubchik2015-06-0221-16/+518
| | | | IO_CACHE tempfiles encryption
* always use my_b_pread() instead of mysql_file_pread()Sergei Golubchik2015-06-025-19/+23
| | | | when working with IO_CACHE's, don't access IO_CACHE::file directly
* my_b_fill, inline my_b_* functions instead of hairy macrosSergei Golubchik2015-06-025-105/+97
|
* misc IO_CACHE cleanupsSergei Golubchik2015-06-0211-228/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | * remove unused (and not implemented) WRITE_NET type * remove cast in my_b_write() macro. my_b_* macros are function-like, casts are responsibility of the caller * replace hackish _my_b_write(info,0,0) with the explicit my_b_flush_io_cache() in my_b_write_byte() * remove unused my_b_fill_cache() * replace pbool -> my_bool * make internal IO_CACHE functions static * reformat comments, correct typos, remove obsolete comments (ISAM) * assert valid cache type in init_functions() * use IO_ROUND_DN() macro where appropriate * remove unused DBUG_EXECUTE_IF in _my_b_cache_write() * remove unnecessary __attribute__((unused)) * fix goto error in parse_file.cc * remove redundant reinit_io_cache() in uniques.cc * don't do reinit_io_cache() if the cache was not initialized in ma_check.c * extract duplicate functionality from various _my_b_*_read functions into a common wrapper. Same for _my_b_*_write * create _my_b_cache_write_r instead of having if's in _my_b_cache_write (similar to existing _my_b_cache_read and _my_b_cache_read_r) * don't call mysql_file_write() from my_b_flush_io_cache(), call info->write_function() instead
* myisam/aria: don't mess with IO_CACHE::fileSergei Golubchik2015-06-022-57/+60
| | | | | that is, don't create a "temporary" IO_CACHE with file==-1 and manually swap it later to the valid file descriptor.
* cleanup: LOAD DATA replication support in IO_CACHESergei Golubchik2015-06-025-98/+37
| | | | | | | | | | | | | | | | remove some 14-year old code that added support for LOAD DATA replication to IO_CACHE: * three callbacks, of which only two were actually used and that were only needed for LOAD DATA replication but were tested in every IO_CACHE instance * an additional opaque void * argument in IO_CACHE, also only used for LOAD DATA replication, but present everywhere * the code to close IO_CACHE prematurely in LOAD DATA to have these callbacks called in the correct order and a long comment explaining what will happen if IO_CACHE is not closed prematurely * a variable to track whether IO_CACHE was closed prematurely (to avoid double-closing it)
* fix cmake dependenciesSergei Golubchik2015-06-021-3/+6
| | | | perfschema after 5.6 merge depends on sql_yacc.h
* remove few #ifdefs in innodb/xtradbSergei Golubchik2015-06-024-50/+6
|
* MDEV-8202 - st_select_lex::master_unit() takes 0.17% in OLTP ROSergey Vojtovich2015-06-022-15/+1
| | | | | | | | | | | | | | | | To make st_select_lex::master_unit() inlinable: - moved it's definition to sql_lex.h - removed base class virtual master_unit() declaration since this method is specific to st_select_lex Overhead change: st_select_lex::master_unit() 0.17% -> out of radar execute_sqlcom_select() 0.13% -> 0.12% JOIN::save_explain_data_intern() 0.27% -> 0.23% JOIN::optimize_inner() 0.76% -> 0.72% JOIN::exec_inner() 0.30% -> 0.24% JOIN::prepare() 0.30% -> 0.29% JOIN::optimize() 0.05% -> 0.05%
* MDEV-8192 - THD::set_command() takes 0.05% in OLTP ROSergey Vojtovich2015-06-022-9/+7
| | | | | | | Moved THD::set_command() definition to sql_class.h so that it can be inlined. Overhead change: THD::set_command 0.05% -> out of radar
* MDEV-8191 - THD::set_query() takes 0.07% in OLTP ROSergey Vojtovich2015-06-022-14/+10
| | | | | | | Moved THD::set_query() definition to sql_class.h so that it can be inlined. Overhead change: THD::set_query 0.07% -> out of radar
* MDEV-8222 "string_field LIKE int_const" returns a wrong result in case of UCS2Alexander Barkov2015-06-027-37/+126
| | | | MDEV-8257 Erroneous "Impossible where" when mixing decimal comparison and LIKE
* update for 32-bit, againSergei Golubchik2015-06-021-70/+67
|
* compilation failure on windowsSergei Golubchik2015-06-011-1/+1
|
* avoid ulong sysvars, prefer uint or ulonglongSergei Golubchik2015-06-015-5/+5
| | | | ulong is not portable - different width on different architectures
* MDEV-7913 main.openssl_6975 'tlsv10' fails in buildbot on Wheezy and PreciseSergei Golubchik2015-06-011-2/+2
| | | | | | version_ssl_library should show the version of openssl library that is being used, not the one that server was compiled with.
* MDEV-8220 Server crashes if started with --enforce-storage-engine optionSergei Golubchik2015-06-014-0/+24
|
* Merge remote-tracking branch 'github/10.1' into 10.1Sergei Golubchik2015-06-016-66/+47
|\
| * Fix test warnings by adding global supression to InnoDB warnings.Jan Lindström2015-05-311-0/+2
| |
| * Fix compiler warning.Jan Lindström2015-05-312-2/+2
| |
| * MDEV-7484: Log Time not consistent with InnoDB errors nor with MySQL error ↵Jan Lindström2015-05-305-66/+45
| | | | | | | | log time format
* | generalize ER_TABLE_NEEDS_UPGRADE to work for views tooSergei Golubchik2015-06-0110-17/+20
| |
* | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011133-24286/+51910
|\ \ | |/ |/|
| * Fix win/ files to be stored with LF in repositorymariadb-10.0.1910.0-defragmentVicentiu Ciorbaru2015-05-0814-862/+862
| | | | | | | | | | On Windows, the files get checked out with CRLF thanks to .gitattributes.
| * update .gitattributesSergei Golubchik2015-05-081-4/+5
| |
| * convert files from CRLF to LF line endingsSergei Golubchik2015-05-08171-14008/+14008
| |
| * bump the VERSIONSergei Golubchik2015-05-081-1/+1
| |
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-05-087-5/+31
| |\
| | * MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEWSergei Golubchik2015-05-073-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | on REPAIR don't do table-specific stuff for views (because even if the view has a temp table opened for it, it's not opened all the way down the engine. In particular, Aria crashes in maria_status() because MARIA_HA* info - that is table->table->file->file - is NULL)
| | * Fix compiler error if compiler does not support c99 styleJan Lindström2015-05-074-3/+14
| | | | | | | | | | | | initializers.
| | * Merge pull request #52 from openquery/MDEV-8053-c99-style-for-structure-membersJan Lindström2015-05-062-2/+2
| | |\ | | | | | | | | c99 style for assigning structure members
| | | * c99 style for assigning structure membersDaniel Black2015-04-252-2/+2
| | | |
| * | | Fixing connect.dbf test failures on big endian machines.Alexander Barkov2015-05-071-24/+38
| | | |
| * | | Merge MDEV-8103 into 10.0mariadb-10.0.18Kristian Nielsen2015-05-061-1/+1
| |\ \ \
| * \ \ \ Merge branch 'Buggynours:10.0' into 10.0Sergei Golubchik2015-05-0517-116/+303
| |\ \ \ \
| | * | | | - Fix a regression bug on (XML) HTML tables.Olivier Bertrand2015-05-057-18/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: tabxml.cpp added: xml_html.test xml_html.result beers.xml coffee.htm - Fix MDEV-7935 by suppressing error resetting code in delete_or_rename_table. However, the issue is that this code was added because without it an assertion was raised in some cases. Unfortunately I can't remember what were these cases. Therefore fixing it in this case will perhaps make a new crash happening on another cases. modified: ha_connect.cc - Add the UDF Json_Array_Delete. modified: jsonudf.cpp
| | * | | | Fix MDEV-8090 in tabmysql.cppSergei Golubchik2015-05-051-2/+9
| | | | | |
| | * | | | - Fix bug on updating JSON expanded valuesOlivier Bertrand2015-05-019-60/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: json.result tabjson.cpp tabjson.h - Fix bug on multiple tables (directories must be eliminated from file list) modified: tabmul.cpp - Update version modified: ha_connect.cc - Typo modified: global.h ha_connect.cc tabtbl.cpp tabutil.cpp value.cpp
| * | | | | MDEV-8096 vio timeouts are multiplied by 1000 for sslSergei Golubchik2015-05-054-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in when using vio->read_timeout (and write_timeout) to set timeouts of a new vio, as in: vio_timeout(vio, 0, old_vio.read_timeout) vio_timeout(vio, 0, old_vio.write_timeout) remember that timeouts are stored in ms, but vio_timeout()'s argument is in seconds.
| * | | | | MDEV-7985: MySQL Users Break when Migrating to MariaDB, part 2Vicențiu Ciorbaru2015-05-053-30/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gave priority to password field when using a native authentication plugin. Also, prevented a user from setting an invalid auth_string, when using native authentication.
| * | | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2015-05-05882-10425/+37075
| |\ \ \ \ \
| | * | | | | mroonga doesn't work in embedded anymoreSergei Golubchik2015-05-053-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | specify RECOMPILE_FOR_EMBEDDED and disable tests in suite.pm