summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler
Commit message (Collapse)AuthorAgeFilesLines
* Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-1/+0
|\
| * Merge with MYSQL 5.1.61Michael Widenius2012-02-201-1/+0
| | | | | | | | | | | | | | | | | | | | Fixed README with link to source Merged InnoDB change to XtraDB README: Added information of where to find MariaDB code storage/archive/ha_archive.cc: Removed memset() of rows, a MariaDB checksum's doesn't touch not used data.
* | Merge with 5.1Michael Widenius2011-11-301-6/+7
|\ \ | |/
| * Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.cc: Free mutex after usage (fixes valgrind warnings in embedded server) mysql-test/include/gis_keys.inc: Fixed failure in innodb.gis_test mysql-test/r/gis.result: Updated result mysql-test/suite/innodb/r/innodb_gis.result: Updated results mysql-test/suite/innodb/t/innodb_bug38231.test: Added handling of timeouts (happend on some servers in buildbot) mysql-test/suite/innodb_plugin/r/innodb_gis.result: Updated results mysql-test/suite/innodb_plugin/t/innodb.test: Use error names instead of numbers mysql-test/suite/innodb_plugin/t/innodb_misc1.test: This test requires utf8 mysql-test/suite/innodb_plugin/t/innodb_mysql.test: This test requires Xtradb sql/sql_base.cc: Don't print table names for placeholders. sql/sql_show.cc: Temporary fix: Save and restore db and table_name in mysqld_show_create (to get rid of valgrind warning) A better solution that needs to be investgated is to not change these fields in mysql_derived_prepare() sql/sql_view.cc: Fixed valgrind warning storage/xtradb/handler/ha_innodb.cc: Don't access THD directly
| * Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE ↵unknown2011-11-301-4/+5
| | | | | | | | | | | | | | | | VECTOR We merged the test case for this into MariaDB 5.1, but the fix was not yet part of XtraDB.
| * Fixed compiler warningsMichael Widenius2011-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dbug/tests.c: Added __attribute__((unused)) to get rid of compiler warning server-tools/instance-manager/guardian.cc: Added __attribute__((unused)) to get rid of compiler warning sql/filesort.cc: Added __attribute__((unused)) to get rid of compiler warning sql/slave.cc: Added __attribute__((unused)) to get rid of compiler warning sql/sql_load.cc: Added __attribute__((unused)) to get rid of compiler warning sql/sql_table.cc: Added __attribute__((unused)) to get rid of compiler warning storage/maria/ma_blockrec.c: Added __attribute__((unused)) to get rid of compiler warning storage/maria/ma_check.c: Added missing cast storage/maria/ma_loghandler.c: Added __attribute__((unused)) to get rid of compiler warning storage/maria/ma_recovery.c: Added __attribute__((unused)) to get rid of compiler warning storage/pbxt/src/cache_xt.cc: Added __attribute__((unused)) to get rid of compiler warning storage/xtradb/fil/fil0fil.c: Removed not used variable storage/xtradb/handler/ha_innodb.cc: Use unused variable vio/viosocket.c: Remove usage of not used variable vio/viosslfactories.c: Added cast
| * Fix Windows build, and a conversion truncation warning.Vladislav Vaintroub2011-11-291-5/+4
| |
* | merge, fix Windows warningsVladislav Vaintroub2011-11-291-1/+1
| |
* | after merge fixesSergei Golubchik2011-11-281-5/+4
| | | | | | | | | | | | | | | | | | | | sql/sql_base.cc: fix a memory leak storage/xtradb/handler/ha_innodb.cc: fix for a visual studio storage/xtradb/row/row0ins.c: valgrind complains about uninitialized variable. incorrect errors in the innodb.test too
* | Merge with MariaDB 5.1Michael Widenius2011-11-245-354/+473
|\ \ | |/
| * Merge with MySQL 5.1.60Michael Widenius2011-11-231-1/+1
| |
| * Merge XtraDB from Percona-Server-5.1.59-13 into MariaDB 5.1.unknown2011-11-215-327/+445
| |
| * typos fixedSergei Golubchik2011-11-081-1/+1
| | | | | | | | (thanks viva64.com)
* | Automatic merge with MariaDB 5.1Michael Widenius2011-05-031-1/+1
|\ \ | |/
| * Fix Xtradb compile error on Win64 - conversion between pointers of different ↵Vladislav Vaintroub2011-05-031-1/+1
| | | | | | | | size
* | Merge with MariaDB 5.1Michael Widenius2011-05-032-28/+126
|\ \ | |/
| * Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-292-28/+126
| |
* | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-284-227/+283
|\ \ | |/
| * Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-222-116/+123
| | | | | | | | | | | | | | mysql-test/r/innodb-zip.result: File has been moved to suite/innodb_plugin mysql-test/t/innodb-zip.test: File has been moved to suite/innodb_plugin
| * Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-043-186/+235
| |
* | virtual columns:Sergei Golubchik2010-12-312-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move a capability from a virtual handler method to table_flags() * rephrase error messages to avoid hard-coded English parts * admit in test cases that they need xtradb, not innodb mysql-test/suite/vcol/t/rpl_vcol.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_handler_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_keys_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_partition_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_select_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_supported_sql_funcs_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test: this test needs xtradb, it will fail with innodb mysql-test/suite/vcol/t/vcol_view_innodb.test: this test needs xtradb, it will fail with innodb sql/ha_partition.h: check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS sql/handler.h: check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS sql/share/errmsg.txt: no hard-coded english parts in the error messages (ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN) sql/sql_table.cc: no hard-coded english parts in the error messages sql/table.cc: * check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS * no "csv workaround" is needed * no hard-coded english parts in the error messages storage/maria/ha_maria.cc: check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS storage/maria/ha_maria.h: check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS storage/myisam/ha_myisam.cc: check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS storage/myisam/ha_myisam.h: check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS storage/xtradb/handler/ha_innodb.cc: check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS storage/xtradb/handler/ha_innodb.h: check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
* | merge with 5.1Michael Widenius2010-11-304-51/+61
|\ \ | |/
| * Fixed compiler warnings and a compilation failure on windowsMichael Widenius2010-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/libevent/event.c: Tried to fix compiler warning on windows extra/libevent/evutil.h: Define __attribute__ for not gcc compilers extra/libevent/kqueue.c: Fixed compiler warnings extra/libevent/signal.c: Tried to fix compiler warning on windows storage/pbxt/src/ha_pbxt.cc: Fixed compiler warning about "variable might be clobbered by longjmp" storage/pbxt/src/table_xt.cc: Fixed compiler warnings (on windows) storage/xtradb/handler/i_s.cc: Fixed compiler warning by invoking the correct store function.
| * Merge of innodb_plugin for MySQL 5.1.53 with xtradbMichael Widenius2010-11-252-26/+54
| | | | | | | | | | | | | | | | Fixed compiler warnings in xtradb Added back resetting of null bitmap but now in row_search_for_mysql() storage/xtradb/row/row0sel.c: Added back resetting of null bitmap but now in row_search_for_mysql()
| * Merge XtraDB from Percona-Server 5.1.52-11.6 into MariaDB 5.1unknown2010-11-243-22/+4
| | | | | | | | revid:oleg.tsarev@percona.com-20101118145125-wjhjrb5jwhi0g7sj
* | merge with 5.1Sergei Golubchik2010-10-251-30/+69
|\ \ | |/
| * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-191-13/+29
| |\
| | * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-191-31/+69
| | |
| * | 5.1.51 mergeSergei Golubchik2010-10-191-28/+51
| |/
* | fix incorrect xtradb plugin metadata.Sergei Golubchik2010-09-111-2/+2
| | | | | | | | build innodb_plugin with *-all build scripts
* | merge with 5.1Sergei Golubchik2010-09-116-190/+470
|\ \ | |/
| * Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-036-190/+451
| |
* | Automerge with 5.1Michael Widenius2010-08-251-1/+1
|\ \ | |/
| * Fixed compiler warnings from Windows compilerMichael Widenius2010-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlcheck.c: Added missing casts client/mysqldump.c: Added missing casts client/mysqlimport.c: Added missing casts extra/my_print_defaults.c: Added missing casts mysql-test/mysql-test-run.pl: Added suppression for non-critical warning on windows storage/maria/maria_pack.c: Added missing casts storage/xtradb/buf/buf0lru.c: Added missing casts storage/xtradb/fil/fil0fil.c: Added missing casts storage/xtradb/handler/i_s.cc: Added extra argument to call store() function for longlong. storage/xtradb/srv/srv0srv.c: Added cast to suppress compiler warning support-files/compiler_warnings.supp: Added suppression for some non critical compiler warnings on Windows unittest/mytap/tap.h: Fixed prototypes to be same as the actual functions
* | Added extra argument to longlong2str() to make it have same prototype is ↵Michael Widenius2010-08-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | int2str() Changed to use longlong10_to_str() instead of longlong2str() when base is 10 or -10 as former is much faster than later Changed my_vsnprintf() to use longlong2str instead of int2str() to get rid of warnings and to get support for long pointers even when long is 32 bit. client/mysqltest.cc: longlong2str() -> longlong10_to_str() include/m_string.h: Added extra argument to longlong2str() to make it have same prototype is int2str() mysys/charset.c: Fixed compiler warning mysys/mf_soundex.c: Fixed compiler warning mysys/my_getopt.c: longlong2str() -> longlong10_to_str() sql/create_options.cc: Fixed compiler warning sql/item_strfunc.cc: Added extra argument to longlong2str sql/opt_range.cc: longlong2str() -> longlong10_to_str() sql/partition_info.cc: longlong2str() -> longlong10_to_str() sql/slave.cc: longlong2str() -> longlong10_to_str() sql/sql_bitmap.h: Added extra argument to longlong2str sql/sql_partition.cc: Added extra argument to longlong2str sql/sql_select.cc: longlong2str() -> longlong10_to_str() sql/sql_show.cc: Added extra argument to longlong2str storage/innodb_plugin/handler/ha_innodb.cc: Update to new parameters for longlong2str() storage/maria/ma_dbug.c: longlong2str() -> longlong10_to_str() storage/maria/maria_chk.c: Added extra argument to longlong2str storage/myisam/mi_dbug.c: longlong2str() -> longlong10_to_str() storage/myisam/myisamchk.c: Added extra argument to longlong2str storage/xtradb/handler/ha_innodb.cc: Update to new parameters for longlong2str() strings/longlong2str.c: Added extra argument to longlong2str() to make it have same prototype is int2str() strings/my_vsnprintf.c: Changed my_vsnprintf() to use longlong2str instead of int2str() to get rid of warnings and to get support for long pointers even when long is 32 bit. Added cast to get rid of compiler warnings
* | Merge with MariaDB 5.1.49Michael Widenius2010-08-055-346/+1016
|\ \ | |/ | | | | | | Removed references to HA_END_SPACE_KEY (which has been 0 for a long time)
| * Merge with 5.1-merge (new XTRADB code updated up to MySQL 5.1.47)Michael Widenius2010-08-055-345/+1014
| |\ | | | | | | | | | Fixed tests cases.
| | * Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-045-343/+1014
| | |
| * | Fixed some test failures after last push (failing tests and valgrind warnings)Michael Widenius2010-08-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --strace support to mysql-test-run mysql-test/mysql-test-run.pl: Added support for --strace (usefull for example to check how much memory mysqld was using) mysql-test/suite/funcs_1/t/is_engines_innodb.test: Fixed test case to also work with xtradb mysql-test/suite/innodb_plugin/t/innodb.test: Don't run if we don't have the used character sets. mysql-test/suite/innodb_plugin/t/innodb_mysql.test: Don't run if we don't have the used character sets. sql/sql_show.cc: Extended comment to 160 characters to get full comment from xtradb storage/xtradb/handler/ha_innodb.cc: Fixed valgrind warning.
| * | Fixes to allow one to compile and test innodb_pluginMichael Widenius2010-08-041-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one compiles innodb_plugin, then the tests in suite/innodb_plugin will use the plugin. If not and xtradb is used, the tests will use xtradb. mysql-test/include/have_innodb_plugin.inc: Test both for innodb_plugin and xtradb mysql-test/include/have_real_innodb_plugin.inc: Test if we are using innodb_plugin (but not xtradb) mysql-test/include/have_xtradb.inc: Test if xtradb is used mysql-test/lib/mtr_cases.pm: Enable easy testing of innodb_plugin mysql-test/mysql-test-run.pl: Added supression for difference between xtradb & innodb_plugin mysql-test/suite/innodb_plugin/r/innodb-index-ip.result: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb-index-xb.result: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb-index.result: Move tests away that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb-ip.result: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb-xb.result: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb.result: Move tests away that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb_bug21704-xb.result: Test result differ for xtradb mysql-test/suite/innodb_plugin/r/innodb_bug46000.result: Remove (not needed) error message not given by MariaDB mysql-test/suite/innodb_plugin/r/innodb_bug49164-xb.result: Test result differs for xtradb mysql-test/suite/innodb_plugin/r/innodb_bug49164.result: Update results mysql-test/suite/innodb_plugin/r/innodb_bug53591.result: Remove (not needed) error message not given by MariaDB mysql-test/suite/innodb_plugin/r/innodb_bug54679.result: Updated result file mysql-test/suite/innodb_plugin/r/innodb_mysql.result: Updated result file mysql-test/suite/innodb_plugin/t/disabled.def: Disable some tests that depends on newer version of XtraDB mysql-test/suite/innodb_plugin/t/innodb-index-ip.test: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb-index-xb.test: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb-index.test: Move tests away that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb-ip.test: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb-xb.test: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb.test: Move tests away that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb_bug21704-xb.test: Test result differ for xtradb mysql-test/suite/innodb_plugin/t/innodb_bug21704.test: Test result differ for xtradb mysql-test/suite/innodb_plugin/t/innodb_bug53591.test: Test results only makes sence for innodb_plugin (things works ok for xtradb) sql/sql_table.cc: Don't set HA_CREATE_USED_ROW_FORMAT for create table (only for update_create_info) if ROW_FORMAT is not used. storage/innodb_plugin/handler/ha_innodb.cc: Fixed wrong error message from innodb. This is needed as MariaDB properly handles errors from ha_index_init() storage/xtradb/handler/ha_innodb.cc: Update base information for XtraDB so that one can use informationschema.plugins to check if one is using XtraDB
* | Automerge MariaDB 5.1->5.2.unknown2010-07-091-5/+5
|\ \ | |/
| * Fix bug 600744Bo Thorsen2010-07-021-5/+5
| |
* | mergeSergei Golubchik2010-06-141-2/+2
|\ \ | |/
| * allow federated and innodb_plugin to be builtSergei Golubchik2010-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage/federated/Makefile.am: federated needs functions from mysys/string.c. mysqld does not use them, so they don't get into the binary. storage/federated/plug.in: enable federated again. remove it from all configurations. storage/federatedx/Makefile.am: federatedx is now called federatedx in configure storage/federatedx/ha_federatedx.cc: federatedx is now called federatedx in configure storage/federatedx/plug.in: federatedx is now called federatedx in configure storage/innodb_plugin/plug.in: enable innodb plugin again. remove it from all configurations. storage/xtradb/CMakeLists.txt: xtradb is now called xtradb in configure, and builds libxtradb.a and ha_xtradb.so storage/xtradb/Makefile.am: xtradb is now called xtradb in configure, and builds libxtradb.a and ha_xtradb.so storage/xtradb/handler/ha_innodb.cc: xtradb is now called xtradb in configure, and builds libxtradb.a and ha_xtradb.so storage/xtradb/plug.in: xtradb is now called xtradb in configure, and builds libxtradb.a and ha_xtradb.so
* | after merge fix.Sergei Golubchik2010-06-073-0/+39
| | | | | | | | | | create st_maria_plugin declarations of new xtradb I_S tables
* | merge 5.1->5.2Sergei Golubchik2010-06-015-57/+757
|\ \ | |/
| * After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update ↵unknown2010-04-281-1/+1
| | | | | | | | and compiler warning removals.
| * Merge XtraDB 10 into MariaDB.unknown2010-04-285-18/+747
| |
| * Merge XtraDB 9.1 into MariaDB.unknown2010-04-281-33/+0
| |
| * Merge MySQL 5.1.46 into MariaDB.mariadb-merge-mysql-5.1.46unknown2010-04-281-6/+10
| | | | | | | | Still two test failures to be solved: main.myisam and main.subselect.
View Lorry Controller Status