summaryrefslogtreecommitdiff
path: root/storage/archive
Commit message (Collapse)AuthorAgeFilesLines
...
* | | - Renaming variables so that they don't shadow others (After this patch one ↵Monty2015-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can compile with -Wshadow and get much fewer warnings) - Changed ER(ER_...) to ER_THD(thd, ER_...) when thd was known or if there was many calls to current_thd in the same function. - Changed ER(ER_..) to ER_THD_OR_DEFAULT(current_thd, ER...) in some places where current_thd is not necessary defined. - Removing calls to current_thd when we have access to thd Part of this is optimization (not calling current_thd when not needed), but part is bug fixing for error condition when current_thd is not defined (For example on startup and end of mysqld) Notable renames done as otherwise a lot of functions would have to be changed: - In JOIN structure renamed: examined_rows -> join_examined_rows record_count -> join_record_count - In Field, renamed new_field() to make_new_field() Other things: - Added DBUG_ASSERT(thd == tmp_thd) in Item_singlerow_subselect() just to be safe. - Removed old 'tab' prefix in JOIN_TAB::save_explain_data() and use members directly - Added 'thd' as argument to a few functions to avoid calling current_thd.
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .bzrignore VERSION cmake/plugin.cmake debian/dist/Debian/control debian/dist/Ubuntu/control mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.result mysql-test/r/null.result mysql-test/r/old-mode.result mysql-test/r/union.result mysql-test/t/join_outer.test mysql-test/t/null.test mysql-test/t/old-mode.test mysql-test/t/union.test packaging/rpm-oel/mysql.spec.in scripts/mysql_config.sh sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/item_cmpfunc.h sql/lock.cc sql/sql_select.cc sql/sql_show.cc sql/sql_update.cc sql/sql_yacc.yy storage/innobase/buf/buf0flu.cc storage/innobase/fil/fil0fil.cc storage/innobase/include/srv0srv.h storage/innobase/lock/lock0lock.cc storage/tokudb/CMakeLists.txt storage/xtradb/buf/buf0flu.cc storage/xtradb/fil/fil0fil.cc storage/xtradb/include/srv0srv.h storage/xtradb/lock/lock0lock.cc support-files/mysql.spec.sh
| * | 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
* | | cleanup: remove table->status from some enginesSergei Golubchik2014-10-011-2/+0
|/ / | | | | | | | | from engines that we don't need to merge from a third-party repository on a regular basis
* | 5.5.38 mergeSergei Golubchik2014-06-061-2/+2
|\ \ | |/
| * mysql-5.5.38 mergeSergei Golubchik2014-06-031-1/+2
| |\
| | * Description: When we execute a correlated subquery on anArun Kuruvila2014-04-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | archive table which is using an auto increment column, the server hangs. In order to recover the mysqld process, it has to be terminated abnormally using SIGKILL. The problem is observed in mysql-5.5. Bug #18065452 "PREPARING" STATE HOGS CPU WITH ARCHIVE + SUBQUERY Analysis: This happens because the server is trapped inside an infinite loop in the function, "subselect_indexsubquery_engine::exec()". This function resolves the correlated suquery by doing an index lookup for the appropriate engine. In case of archive engine, after reaching the end of records, "table->status" is not set to STATUS_NOT_FOUND. As a result the loop is not terminated. Fix: The "table->status" is set to STATUS_NOT_FOUND when the end of records is reached.
* | | 5.5 mergeSergei Golubchik2014-05-091-0/+1
|\ \ \ | |/ /
| * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-0/+1
| |\ \ | | |/
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1
| | | | | | | | | | | | | | | to copyright header.
* | | compilation failure on windowsSergei Golubchik2014-03-271-12/+3
| | |
* | | MDEV-5818: MySQL WL#6145: Separate the dependence of DATA DIRECTORY from ↵Michael Widenius2014-03-231-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symbolic links Copied relevant test cases and code from the MySQL 5.6 tree Testing of my_use_symdir moved to engines. mysql-test/r/partition_windows.result: Updated result file mysql-test/suite/archive/archive_no_symlink-master.opt: Testing of symlinks with archive mysql-test/suite/archive/archive_no_symlink.result: Testing of symlinks with archive mysql-test/suite/archive/archive_no_symlink.test: Testing of symlinks with archive mysql-test/suite/archive/archive_symlink.result: Testing of symlinks with archive mysql-test/suite/archive/archive_symlink.test: Testing of symlinks with archive sql/log_event.cc: Updated comment sql/partition_info.cc: Don't test my_use_symdir here sql/sql_parse.cc: Updated comment sql/sql_table.cc: Don't test my_use_symdir here sql/table.cc: Added more DBUG_PRINT storage/archive/ha_archive.cc: Give warnings for index_file_name and if we can't use data directory storage/myisam/ha_myisam.cc: Give warnings if we can't use data directory or index directory
* | | MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Cleanups: * remove unused HA_EXTRA_EXPORT (can be added later if needed, e.g. for Aria) * clarify the meaning of HA_CAN_EXPORT * make all engines that support EXPORT to announce it * reduce code duplication
* | | MDEV-4786 - merge 10.0-monty - 10.0Sergey Vojtovich2013-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed archive.archive non-debug failure. Applied revision: sergey.vojtovich@oracle.com-20111008171828-vje5pumzvl04rdbb Archive didn't read blobs from original table while performing REPAIR TABLE with non-debug builds. storage/archive/ha_archive.cc: Mark all columns for read independently of DBUG state. It instructs ::get_row_version2() to read all blobs.
* | | MDEV-4786 - merge 10.0-monty - 10.0Sergey Vojtovich2013-07-292-24/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed archive.archive failure. Applied remnants of two revisions, which were partially merged. Rev. 3225.1.1 (5.0 compatibility): BUG#11756687 - 48633: ARCHIVE TABLES ARE NOT UPGRADEABLE Archive table created by 5.0 were not accessible. This patch adds various fixes so that 5.0 archive tables are readable and writable. Though it is strongly recommended to avoid binary upgrade of archive tables whenever it is possible. Rev. 3710 (due to valgrind warnings): Bug#13907676: HA_ARCHIVE::INFO In WL#4305 the refactoring of the archive writer, it could flush the writer when it was not yet open. This was due to if bulk insert was used but no rows was actually inserted (write_row was never called), the writer was marked dirty even if it was not open. Fix was to only mark it as dirty if it was opened. mysql-test/std_data/bug48633.ARM: A test case for BUG#11756687: archive table created by 5.0.95. mysql-test/std_data/bug48633.ARZ: A test case for BUG#11756687: archive table created by 5.0.95. mysql-test/std_data/bug48633.frm: A test case for BUG#11756687: archive table created by 5.0.95. mysql-test/suite/archive/archive.result: Modified a test case for BUG#47012 according to fix for BUG#11756687. Added a test case for BUG#11756687. mysql-test/suite/archive/archive.test: Modified a test case for BUG#47012 according to fix for BUG#11756687. Added a test case for BUG#11756687. No need to remove .ARM files anymore: DROP TABLE will take care of them. storage/archive/azio.c: Do not write AZIO (v.3) header to GZIO file (v.1). Added initialization of various azio_stream members to read_header() so it can proceed with v.1 format. Update data start position only when reading first GZIO header. That is only on azopen(), but never on azread(). storage/archive/ha_archive.cc: Removed guardians that were rejecting to open v.1 archive tables. Reload .frm when repairing v.1 tables - they didn't have storage for .frm. Do not flush write stream when it is not open. Let DROP TABLE remove 5.0 .ARM files.
* | | more post-merge fixes:Sergei Golubchik2013-07-211-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | * update results * don't force HA_CREATE_DELAY_KEY_WRITE on all temp tables, (bad for CREATE ... LIKE) instead imply it in myisam/aria * restore HA_ERR_TABLE_DEF_CHANGED in archive * increase the default number of rwlock classes in P_S to fit all our rwlocks
* | | 10.0-monty mergeSergei Golubchik2013-07-212-186/+261
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-184/+261
| | | |
| * | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-1/+1
| | | |
| * | | 10.0-base mergeSergei Golubchik2013-01-312-2/+2
| |\ \ \
| * \ \ \ Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-1/+0
| |\ \ \ \
| * \ \ \ \ merge with 5.5Sergei Golubchik2012-11-031-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ 10.0-base -> 10.0-montySergei Golubchik2012-10-192-16/+38
| |\ \ \ \ \ \
| * | | | | | | Added support of thd->tx_read_onlyMichael Widenius2012-08-071-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved timestamp handling from all handler::write() methods in the storage engines to handler::ha_write sql/handler.cc: Added PSI_CALL's
* | | | | | | | 5.5 mergeSergei Golubchik2013-07-171-0/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | MDEV-4444 Server crashes with "safe_mutex: Trying to destroy a mutex ↵Sergei Golubchik2013-06-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | share->mutex that was locked" on attempt to recover an archive table
* | | | | | | | TABLE_SHARE::free_frm_image() method to free the memorySergei Golubchik2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocated by the same allocator as in TABLE_SHARE::read_frm_image()
* | | | | | | | * frm extra2 segment.Sergei Golubchik2013-04-093-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * persistent table versions in the extra2 * ha_archive::frm_compare using TABLE_SHARE::tabledef_version * distinguish between "important" and "optional" extra2 frm values * write engine-defined attributes (aka "table options") to extra2, not to extra, but still read from the old location, if they're found there.
* | | | | | | | discovery using sql CREATE TABLE statementSergei Golubchik2013-04-091-3/+2
| | | | | | | |
* | | | | | | | CREATE TABLE and frm-less discovering engines.Sergei Golubchik2013-04-094-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now CREATE TABLE does not write the frm file on disk, if the engine can discover it
* | | | | | | | HA_ERR_TABLE_DEF_CHANGED support in ha_archiveSergei Golubchik2013-04-092-62/+82
| | | | | | | |
* | | | | | | | move writing of the frm into init_from_binary_frm_image()Sergei Golubchik2013-04-091-12/+14
| | | | | | | |
* | | | | | | | single table discovery: handlerton::discover_table() method.Sergei Golubchik2013-04-093-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes for need_full_discover_for_existence mode
* | | | | | | | file-based table discovery for discovering storage enginesSergei Golubchik2013-04-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also: * move few tests from archive/archive.test to archive/discover.test * fix (unintentionally) bug#34104, updated result files
* | | | | | | | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-072-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * provide a default bas_ext value of the empty list
* | | | | | | | small cleanupSergei Golubchik2013-04-071-17/+1
| | | | | | | |
* | | | | | | | 5.5 mergeSergei Golubchik2013-03-271-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-5/+5
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Bug #13819630 ARCHIVE TABLE WITH 1000+ PARTITIONS CRASHES SERVER Annamalai Gurusami2012-12-201-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ON "DROP TABLE" In the function ha_archive::write_row(), there is an error code path that exits the function without releasing the mutex that was acquired earlier. rb#1743 approved by ramil.
* | | | | | fix the failing federated.federated_innodb test:Sergei Golubchik2013-01-232-2/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | update all start_bulk_insert() methods to the new signature.
* | | | | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-171-1/+0
| | | | |
* | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | mysql-5.5.28Sergei Golubchik2012-10-161-3/+3
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTEDMarc Alff2012-08-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING This patch is for mysql-5.5 only, to be null-merged to mysql-5.6 and mysql-trunk. This is a partial rollback of the file io instrumentation, removing the instrumentation for mysql_file_stat in the archive engine. See the bug comments for details.
* | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-2/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalized support for auto-updated and/or auto-initialized timestamp and datetime columns. This patch is a reimplementation of MySQL's "WL#5874: CURRENT_TIMESTAMP as DEFAULT for DATETIME columns". In order to ease future merges, this implementation reused few function and variable names from MySQL's patch, however the implementation is quite different. TODO: The only unresolved problem in this patch is the semantics of LOAD DATA for TIMESTAMP and DATETIME columns in the cases when there are missing or NULL columns. I couldn't fully comprehend the logic behind MySQL's behavior and its relationship with their own documentation, so I left the results to be more consistent with all other LOAD cases. The problematic test cases can be seen by running the test file function_defaults, and observing the test case differences. Those were left on purpose for discussion.
* | | merge with MySQL 5.5.27Sergei Golubchik2012-08-092-16/+38
|\ \ \ | |/ / | | / | |/ |/| manually checked every change, reverted incorrect or stupid changes.
| * Bug 14116252 - CANNOT BUILD ARCHIVE ENGINE WHEN WITH_PERFSCHEMA_STORAGE_ENGINE=0Marc Alff2012-05-312-0/+4
| | | | | | | | | | Fixed a build break with compiling without the performance schema, instrumentation should be protected by HAVE_PSI_INTERFACE
| * Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTEDMayank Prasad2012-05-242-16/+34
| | | | | | | | | | | | | | | | | | Details: - Archive storage engine file access were not instrumented and thus were not shown in PS tables. Fix: - Added instrumentation code by using PS Apis for I/O.
* | Merge of compatibility fixesMichael Widenius2012-04-021-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing tests in sys_vars as we have now stricter checking of setting of variables. mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test: One can now only assign 0 or 1 to boolean variables mysys/my_getsystime.c: Merge + fixed bug that __NR_clock_gettime didn't work in 5.5
| * \ Automatic mergeMichael Widenius2012-03-281-1/+3
| |\ \
View Lorry Controller Status