summaryrefslogtreecommitdiff
path: root/storage/pbxt
Commit message (Collapse)AuthorAgeFilesLines
* 5.2->5.3 mergeSergei Golubchik2011-11-122-4/+1
|\
| * 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes).unknown2011-10-279-20/+47
| |\
| | * Fix gcc 4.6 warnings about assigned but not used variables.unknown2011-10-279-20/+47
| | | | | | | | | | | | | | | Fixed my_gethwaddr.c to allow compilation on Mac OS X.
* | | Compiler warning about assigned but not used variables fixed.unknown2011-10-189-19/+49
| | |
* | | mergeSergei Golubchik2011-10-111-1/+0
|\ \ \ | |/ /
| * | merge with 5.1Sergei Golubchik2011-10-071-1/+0
| |\ \ | | |/
| | * remove redundant declarationsSergei Golubchik2011-10-041-1/+0
| | |
* | | Merge with 5.2Michael Widenius2011-09-101-1/+1
|\ \ \ | |/ /
| * | Fixed that automatic killing of delayed insert thread (in flush, alter table ↵Michael Widenius2011-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | etc) will not abort auto-repair of MyISAM table. Give more information when finding an error in a MyISAM table. When killing system thread, use KILL_SYSTEM_THREAD instead of KILL_CONNECTION to make it easier to ignore the signal in sensitive context (like auto-repair) Added new kill level: KILL_SERVER that will in the future to be used to signal killed by shutdown. Add more warnings about killed connections when warning level > 3 include/myisamchk.h: Added counting of printed info/notes mysys/mf_iocache.c: Remove duplicate assignment sql/handler.cc: Added test of KILL_SERVER sql/log.cc: Ignore new 'kill' error ER_NEW_ABORTING_CONNECTION when requesting query error code. sql/mysqld.cc: Add more warnings for killed connections when warning level > 3 sql/scheduler.cc: Added checks for new kill signals sql/slave.cc: Ignore new kill signal ER_NEW_ABORTING_CONNECTION sql/sp_head.cc: Fixed assignment to bool Added testing of new kill signals sql/sql_base.cc: Use KILL_SYSTEM_THREAD to auto-kill system threads sql/sql_class.cc: Add more warnings for killed connections when warning level > 3 thd_killed() now ignores KILL_BAD_DATA and THD::KILL_SYSTEM_THREAD as these should not abort sensitive operations. sql/sql_class.h: Added KILL_SYSTEM_THREAD and KILL_SERVER sql/sql_connect.cc: Added handling of KILL_SERVER sql/sql_insert.cc: Use KILL_SYSTEM_THREAD to auto-kill system threads Added handling of KILL_SERVER sql/sql_parse.cc: Add more warnings for killed connections when warning level > 3 Added checking that thd->abort_on_warning is reset at end of query. sql/sql_show.cc: Update condition for when a query is 'killed' storage/myisam/ha_myisam.cc: Added counting of info/notes printed storage/myisam/mi_check.c: Always print an an error if we find data errors when checking/repairing a MyISAM table. When a repair was killed, don't retry repair. Added assert if sort_get_next_record() returned an error without an error message. Removed nonsence check "if (sort_param->read_cache.error < 0)" in repair. storage/myisam/myisamchk.c: Added counting of notes printed storage/pbxt/src/thread_xt.cc: Better error message.
* | | Merge 5.2 -> 5.3 Sergey Petrunya2011-06-241-30/+9
|\ \ \ | |/ / | | | | | | (testcase for #798597 now crashes)
| * | Change in PBXT to only use pth_set_priority() (not setpriority()) to set ↵Michael Widenius2011-06-131-30/+9
| | | | | | | | | | | | priority
* | | Fix compile errors and warnings and test errors introduced by microseconds push.Vladislav Vaintroub2011-05-283-56/+6
| | | | | | | | | | | | Also, change windows timespec definition to be Unix-ish - simplifies handling a lot.
* | | mergeVladislav Vaintroub2011-05-271-0/+2
|\ \ \ | |/ /
| * | Merge with 5.1 to get in fix wrong setpriority() callMichael Widenius2011-05-261-0/+2
| |\ \ | | |/
| | * Disable call to setpriority() in pbxt. This caused mysqld to run with nice ↵Michael Widenius2011-05-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | priority -19, which was far from optimal. mysql-test/suite/innodb/r/innodb_bug60049.result: Updated results mysql-test/suite/innodb/t/innodb_bug60049.test: Force global.innodb_fast_shutdown to 0 as test require it mysql-test/suite/innodb_plugin/t/innodb_bug60049.test: Force global.innodb_fast_shutdown to 0 as test require it storage/pbxt/src/pthread_xt.cc: Disable call to setpriority()
* | | Merge with 5.2Michael Widenius2011-05-165-1/+12
|\ \ \ | |/ /
| * | Fix PBXT bugs found while testing with Application Verifier : Vladislav Vaintroub2011-05-144-0/+12
| | | | | | | | | | | | | | | | | | | | | LPBUG#782269 : critical sections are initialized twice in xt_xn_init_db() LPBUG#782431: active lock in memory released by xt_ind_exit() LPBUG#782433 : xt_heap_release() does not release spinlock hp->h_lock initialized in xt_heap_new(). LPBUG#782435: xt_exit_row_locks() tries to release unallocated locks
| * | LPBUG#782269 : Fixed double initialization of condition variables in PBXT.Vladislav Vaintroub2011-05-131-1/+0
| | |
* | | Merge with MariaDB 5.2Michael Widenius2011-05-101-0/+1
|\ \ \ | |/ /
| * | Merge Mariadb 5.1->5.2unknown2011-04-121-0/+1
| |\ \ | | |/
| | * fixed the preload.test pbxt bugVladimir Kolesnikov2011-04-071-0/+1
| | |
* | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-013-6/+22
|\ \ \ | |/ /
| * | Merge with 5.1 to get fixes for tests and compiler warningsMichael Widenius2011-03-011-2/+2
| |\ \ | | |/
| | * Get rid of compiler warningsMichael Widenius2011-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | mysql-test/suite/parts/t/partition_alter4_innodb.test: Removed duplicated big_test marker sql-common/my_time.c: Get rid of compiler warning about uninitialized members
| * | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-283-4/+20
| |\ \ | | |/
| | * Automatic merge with 5.1-merge to get in Merge with MySQL 5.1.55Michael Widenius2011-02-262-2/+5
| | |\ | | | | | | | | | | | | | | | | mysql-test/suite/parts/t/partition_debug_sync_innodb.test: Fixed failure on windows partition file is with small '#p#'
| | | * Fixed compiler and build error:Michael Widenius2011-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed main.mysqlcheck error on windows - Fixed 'can't drop database pbxt' failure when running pbxt.mysqlslap sql/table.cc: When using not legal file names for checking a non existing table, one got a warning in the log file which caused mysql.mysqlcheck to fail storage/innodb_plugin/row/row0upd.c: Fixed compiler warning storage/pbxt/src/table_xt.cc: Remove table that is dropped from 'repair-pending'. Fixed 'can't drop database pbxt' failure when running pbxt.mysqlslap
| | | * Fixed build failuresMichael Widenius2011-02-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed references to deleted files - If we link staticly, check for static zlib - This should fix the problem with 'no -lz found' link error - Fixed build failure on window (Patch from Wlad) - Fixed build problem with federatedx when using -Werror BUILD/Makefile.am: Remove removed file config/ac-macros/zlib.m4: If we compile with --all-static, test that we have a static libz libmysqld/CMakeLists.txt: Fix for build error on windows mysql-test/suite/pbxt/r/key_cache.result: Updated result mysql-test/suite/pbxt/t/key_cache.test: Fixed not updated test case sql/CMakeLists.txt: Fix for build error on windows storage/federatedx/Makefile.am: Don't use CFLAGS to compile C++ programs storage/pbxt/src/lock_xt.cc: Fixed compiler warning about using uninitialized b2 storage/xtradb/buf/buf0buf.c: Fixed wrong printf storage/xtradb/srv/srv0srv.c: Fixed assignment of different width and test with different sign/unsigned
| | * | MBUG#688404 : Fix pbxt crashes on Windows 64 in debug build Vladislav Vaintroub2011-02-251-2/+15
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the crash is misalignment on SSE instruciton in setjmp(). The root cause is PBXT debug malloc(), which unlike OS malloc does not guarantee 16 bytes alignment. So the fix for now is disable PBXT debug malloc on Windows. It was obsolete anyway, as it does not provide additional benefits to C runtime debug routines (always used in debug compilation) or to pageheap, available at runtime.
* | | Merge MWL#116, PBXT part into mariadb-5.2-rplunknown2011-01-314-47/+146
|\ \ \ | |/ / |/| | | | | | | | | | | | | | This makes PBXT implement the commit_ordered() method, so that cross-engine START TRANSACTION WITH CONSISTENT SNAPSHOT works actually consistent with XtraDB. Also mark the version number to show this is the -rpl feature preview.
| * | MWL#116: Efficient group commit: PBXT partunknown2010-10-154-47/+146
| | | | | | | | | | | | | | | | | | | | | | | | Implement the commit_ordered() API in PBXT, getting consistent commit ordering with other engines and binlog. Make pbxt_support_xa default in MariaDB debug build (as the bug that causes assert in MySQL is fixed in MariaDB).
* | | mergeVladislav Vaintroub2010-12-061-3/+0
|\ \ \ | | |/ | |/|
| * | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: inconsistent compilation, federatedx is compiled without SAFEMALLOC flag, while anything else is compiled with SAFEMALLOC. As a consequence, my_hash_init used inside federatedx initialization does not provide correct caller info parameters (file, line) , so they are initialized with whatever is on stack. When info about allocated memory is output in COM_DEBUG command, the server crashes trying to output string starting at 0xcccccccccccccccc. The fix is to remove SAFEMALLOC preprocessor flags from every CMakeLists.txt, except the top-level one. Also, SAFEMALLOC is not defined by default now, instead there is WITH_DEBUG_FULL CMake option which adds -DSAFEMALLOC to C and C++ flags in debug compilation. This option is off by default, because 1) Debug C runtime already has heap debugging builtin with overwrite and leak detection 2)safemalloc considerably slows down the tests. Note also that - SAFEMALLOC is gone in MySQL5.5 - On Windows, heap related overflows can also be found using free pageheap utility (that is also part of application verifier). This is even more efficient if there are no other layers on top of Windows heap allocator, e.g it is most efficient with release version.
* | | merge with 5.1Michael Widenius2010-11-302-8/+9
|\ \ \ | |/ /
| * | Fixed compiler warnings and a compilation failure on windowsMichael Widenius2010-11-272-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Patch from Sergey Petrunya:Michael Widenius2010-11-261-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix post-merge failure in 5.1-merge - Let QUICK_RANGE_INTERSECT_SELECT not make assumption that HA_EXTRA_KEYREAD scans do not touch parts of table->record[0] that refer to fields that are not covered by the used index. This assumption is not true for XtraDB (e.g. grep row/row0sel.c for "init null bytes with default values as they might be").
* | | Merge MariaDB 5.1->5.2unknown2010-11-192-13/+18
|\ \ \ | |/ /
| * | MWL#74: Shared libmysqld.so library.unknown2010-11-172-13/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch makefiles to use libtool to build libmysqld.so, as well as all its dependencies. The previous MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS() declaration is removed, as it does not work well with a libtool build. Instead, plugins that need it can specify an alternate object in MYSQL_PLUGIN_STATIC() that will be used for embedded library. The plugin must then take care itself of compiling the special object for embedded, rebuilding the source files previously listed in MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS() with @plugin_embedded_defs@ in CFLAGS/CXXFLAGS. The extra target @XXX_embedded_static_target@ is available for the special object, this will be empty when --without-embedded-server. All in-tree plugins are changed to build their static targets with libtool. Additional plugins that want to work with libmysqld.so will need to be similarly modified to build with libtool (or otherwise provide an -fPIC object). Dynamically loaded plugins are not affected. The old libraries like libmysys.a, libmyisam.a and similar libraries, which were installed by `make install` though this is of little use, are still built and installed to not break package scripts etc. that expect them. These libraries are kept static to avoid introducing new .so dependencies. The patch also fixes a handfull of duplicate symbol linker errors, where we included some object twice during linking; these for one reason or another did not produce errors before but caused problems on some platforms with this patch (eg. Mac OS X linker is more strict for shared objects). This patch only does what is necessary to build libmysqld.so. There are some more cleanups that are possible now that we are using libtool more fully, which could done in subsequent patches (though we may not bother as we are switching from autotools to CMake anyway): - In libmysql_r/, we should be able to just link libmysys.la etc, instead of symlinking and re-compiling sources into the directory. - In libmysql/, we can similarly avoid symlinking and recompiling sources if we instead build a libmysys_nothread.la library with appropriate CFLAGS and link that. - In sql/, we can build a separate target libmysql_int.la with appropriate CFLAGS for embedded and use that in libmysqld/ instead of symlinking sources. - libmysys.a, libmyisam.a and similar libraries could be installed as .so also to save on code size; or alternatively could be not installed at all. client/Makefile.am: Updated for using libtool config/ac-macros/plugins.m4: Replace MUSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS with mechanism for plugins to specify alternate object for embedded. configure.in: Fix linking duplicate objects related to THREAD_LOBJECTS. dbug/Makefile.am: Updated for using libtool extra/Makefile.am: Fix relative paths. libmysqld/Makefile.am: Build libmysqld.la using libtool libmysqld/examples/Makefile.am: Updated to use libtool mysys/Makefile.am: Updated to use libtool. Fix linking duplicate objects related to THREAD_LOBJECTS. mysys/my_uuid.c: Fix conflicting global mutex name by making it static. regex/Makefile.am: Updated to use libtool sql/Makefile.am: Updated to use libtool sql/item_func.cc: Fix conflicting mutex name. sql/mysql_priv.h: Fix conflicting mutex name sql/mysqld.cc: Fix conflicting mutex name. Add missing call of my_uuid_end(). storage/archive/Makefile.am: Updated to use libtool storage/archive/plug.in: Updated to use libtool storage/blackhole/Makefile.am: Updated to use libtool storage/blackhole/plug.in: Updated to use libtool storage/csv/Makefile.am: Updated to use libtool storage/csv/plug.in: Updated to use libtool storage/example/Makefile.am: Updated to use libtool storage/federated/Makefile.am: Updated to use libtool storage/federated/plug.in: Updated to use libtool storage/federatedx/Makefile.am: Updated to use libtool storage/federatedx/plug.in: Updated to use libtool storage/heap/Makefile.am: Updated to use libtool storage/heap/plug.in: Updated to use libtool storage/innobase/Makefile.am: Updated to use libtool storage/innobase/plug.in.disabled: Updated to use libtool storage/innodb_plugin/Makefile.am: Updated to use libtool storage/maria/CMakeLists.txt: Fix linking duplicate object in maria_dump_log, causes failure on Mac OS X storage/maria/Makefile.am: Updated to use libtool Fix linking duplicate object in maria_dump_log, causes link failure on Mac OS X storage/maria/ma_loghandler.c: Move maria_dump_log code to separate file to fix duplicate object link failures. storage/maria/ma_loghandler.h: Move maria_dump_log code to separate file to fix duplicate object link failures. storage/maria/maria_dump_log.c: Move maria_dump_log code to separate file to fix duplicate object link failures. storage/maria/plug.in: Updated to use libtool storage/myisam/Makefile.am: Updated to use libtool storage/myisam/plug.in: Updated to use libtool storage/myisammrg/Makefile.am: Updated to use libtool storage/myisammrg/plug.in: Updated to use libtool storage/pbxt/plug.in: Updated to use libtool storage/pbxt/src/Makefile.am: Updated to use libtool storage/xtradb/Makefile.am: Updated to use libtool storage/xtradb/plug.in: Updated to use libtool strings/Makefile.am: Updated to use libtool unittest/unit.pl: Don't attempt to run libtool internal files as unit tests. vio/Makefile.am: Updated to use libtool
* | Automatic merge with 5.1Michael Widenius2010-10-0620-84/+636
|\ \ | |/
| * Merge with 1.0.11-7 Pre-GA - 2010-09-09Michael Widenius2010-09-2820-83/+663
| | | | | | | | Updated results for failing test cases (In all cases the estimated number of rows was different)
* | oqgraph and sphinx on windowsSergei Golubchik2010-09-151-0/+3
| |
* | merge with 5.1Sergei Golubchik2010-09-111-2/+2
|\ \ | |/
| * build dynamic plugins with the -shared libtool option to avoidSergei Golubchik2010-09-091-2/+2
| | | | | | | | double compilation
* | merge 5.1->5.2Sergei Golubchik2010-06-0139-460/+2345
|\ \ | |/
| * Fixed compiler warningsMichael Widenius2010-05-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing test innodb.innodb-autoinc.test Enabled innodb test suite mysql-test/mysql-test-run.pl: Enabled innodb test suite mysql-test/r/innodb-autoinc.result: Removed test as it exists in suite innodb mysql-test/suite/innodb/t/disabled.def: Removed innodb-autoinc mysql-test/suite/innodb/t/innodb-autoinc.test: Update to be able to run with plugin mysql-test/t/innodb-autoinc.test: Removed test as it exists in suite innodb sql/filesort.cc: Removed not used variable sql/slave.cc: Remove compiler warnings storage/pbxt/src/ha_pbxt.cc: Removed not used variable storage/xtradb/dict/dict0crea.c: Fixed compiler warning about unsigned comparison support-files/compiler_warnings.supp: Disable some not relevant warnings
| * Resolve bzr conflictsMichael Widenius2010-05-261-4/+2
| | | | | | | | | | storage/pbxt/src/ha_pbxt.cc: LOCK_plugin is not locked anymore as part of plugin initialization
| * Merge with MySQL 5.1.47Michael Widenius2010-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | Fixed some bugs introduced in 5.1.47 Disabled some tests until we have merged with latest Xtradb configure.in: Added testing if valgrind/memcheck.h exists storage/pbxt/src/ha_pbxt.cc: LOCK_plugin is not anymore locked in init
| * Fixed build failures and compiler warningMichael Widenius2010-05-145-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/binlog/r/binlog_unsafe.result: Updated results (RAND() doesn't require statement based logging anymore for inserts) mysql-test/t/information_schema_all_engines.test: Ensure that InnoDB is used storage/pbxt/bin/Makefile.am: Fixed build failure on build hosts (Patch from Kristian Nielsen) storage/pbxt/bin/xtstat_xt.cc: Added missing argument storage/pbxt/src/datalog_xt.cc: Fixed compiler warnings storage/pbxt/src/ha_pbxt.cc: Fixed compiler warnings storage/pbxt/src/table_xt.cc: Fixed compiler warnings support-files/compiler_warnings.supp: Added suppression of compiler warnings in Xtradb (Failure can only happen for corrupted tables, but should be fixed properly at some point)
| * Merge to get PBXT's xstat programMichael Widenius2010-05-126-1/+840
| |\ | | | | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: Added copying of xstat scripts/make_win_bin_dist: Added copying of xstat
| | * Added the PBXT utility program xtstatPaul McCullagh2010-05-113-1/+834
| | |
View Lorry Controller Status