mariadb

Tree: cd03a4625f

Author	SHA1	Message	Date
Vladislav Vaintroub	cd03a4625f	Bug #51488 :missing features and change behavior in cmake runs compared to autotools runs - Fix recognition of --with-debug=full in configure wrapper - Remove CMakeCache.txt in configure wrapper, to match the original - Fix recognition of max-no-ndb - Fix broken dependencies of mysql_fix_privilege_table.sql from mysql_system_tables.sql and mysql_system_tables_fix.sql - Add "distclean target" that informs user about appropriate bzr command cmake/configure.pl: - Recognize --with-debug=full, map to WITH_DEBUG_FULL - remove CMakeCache.txt, so the configuration is no more sticky (to match the original configure behavior) cmake/plugin.cmake: - Recognize WITH_MAX_NO_NDB, this fixes missing storage engines after BUILD/max-no-ndb scripts mysql-test/CMakeLists.txt: test-force uses the same macros (MTR_FORCE) as test-bt now scripts/CMakeLists.txt: - Fix broken dependency when producing mysql_fix_privilege_tables.sql, reported by Davi. We now concatenate 2 scripts in custom command that has dependency on both scripts rather than concatenating them at cmake time. sql/CMakeLists.txt: Address frequently asked question "where is distclean" by implementing distclean target that does nothing except pointing to appropriate bzr command. It is better not to call "bzr clean-tree" automatically, without user consent. It could clean new files that were meant to be added.	16 years ago
Vladislav Vaintroub	0139908c7e	merge	16 years ago
Alexey Botchkov	b184d466ac	merging.	16 years ago
Vladislav Vaintroub	40e12231fe	Fix WITH_DEBUG problems in CMake build, so people who use configure wrappers do not suffer. The problem was that when custom C flags were defined with in environment variable CFLAGS, WITH_DEBUG did not have any effect. Also, switch from WITH_DEBUG=ON to WITH_DEBUG=OFF was not handled correctly .Expected is switch to with RelwithDebInfo or when custom compiler flags are defined, to None.	16 years ago
Marc Alff	77385a9136	Bug#51612 Un initialized locker_lost variable in pfs_instr.cc Fixed the missing initialization of locker_lost. This fix is not strictly necessary, but is desirable to re-align the code from 5.5 and 6.0, and reduce the spurious code differences. This will facilitate maintenance and help to apply patches cleanly, for merges.	16 years ago
Roy Lyseng	74310b21f1	WL#5252: deprecate --optimizer_search_depth=63 Followup: Changes in sys_vars test suite mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result Added warnings.	16 years ago
Dmitry Lenev	9b705237b6	Merged recent changes from mysql-next-mr-bugfixing into mysql-next-4284 tree.	16 years ago
Dmitry Lenev	5e09c42f21	Merged recent changes from mysql-next-mr-bugfixing into mysql-next-4284.	16 years ago
Andrei Elkin	8f11b10c22	BUG#50296 restoring the maximum of slave_net_timeout as defined #define LONG_TIMEOUT ((ulong) 3600L24L365L)	16 years ago
Roy Lyseng	b71eb4192c	WL#5252: Deprecate --optimizer_search_depth=63 Add deprecation warning when variable optimizer_search_depth is given the value 63. mysql-test/r/greedy_optimizer.result Updated with warning text. mysql-test/r/mysqld--help-notwin.result Updated with warning from mysqld --help --verbose. mysql-test/r/mysqld--help-win.result Updated with warning from mysqld --help --verbose. sql/sys_vars.cc Added an update check function to the constructor invocation for the optimizer_search_depth variable. The function emits a warning message for the value 63.	16 years ago
Dmitry Lenev	629be0947e	Merge recent changes from mysql-next-mr-bugfixing into mysql-next-4284 tree.	16 years ago
Marc Alff	de39f438e3	local merge before push to mysql-next-mr-bugfixing	16 years ago
Marc Alff	6d4cfbbca5	Bug#50296 Slave reconnects earlier than the prescribed slave_net_timeout value Fixed failed assert on 64 bit platforms, introduced by the previous fix. mysqld: sys_vars.h:125: Assertion `size == sizeof(T)' failed.	16 years ago
Alexey Botchkov	a8d2da2336	Bug#42465 mysqlhotcopy fails with "Table '<y>' was locked with a READ lock" error message. Since 5.5 FLUSH TABLES requires unlocked tables so the old LOCK TABLES/FLUSH TABLES model fails. Use atomic FLUSH TABLES WITH READ LOCK instead. per-file comments: scripts/mysqlhotcopy.sh Bug#42465 mysqlhotcopy fails with "Table '<y>' was locked with a READ lock" error message. Use FLUSH TABLES WITH READ LOCK instead of LOCK TABLES / FLUSH TABLES pair. Keep the old scheme for older servers.	16 years ago
Andrei Elkin	82fe344cbe	merging to 6.0-codebase-bugfixing from a local branch	16 years ago
Andrei Elkin	055c61049e	bug#50296 a small refinement to the test	16 years ago
Andrei Elkin	1faafbb047	Bug #50296 Slave reconnects earlier than the prescribed slave_net_timeout value There was auto-reconnecting by slave earlier than a prescribed by slave_net_timeout value. The issue happened on 64bit solaris that spotted rather incorrect casting of the ulong slave_net_timeout into the uint of mysql.options.read_timeout. Notice, that there is no reason for slave_net_timeout to be of type of ulong. Since it's primarily passed as arg to mysql_options the type can be made as uint to avoid all conversion hassles. That's what the fixes are made. A "side" effect of the patch is a new value for the max of slave_net_timeout to be the max of the unsigned int type (therefore to vary across platforms). Note, a regression test can't be made to run reliably without making it to last over some 20 secs. That's why it is placed in suite/large_tests. mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result: the new test results. mysql-test/suite/large_tests/t/rpl_slave_net_timeout-slave.opt: Initialization of the option that yields slave_net_timeout's default. sql/mysql_priv.h: changing type for slave_net_timeout from ulong to uint sql/mysqld.cc: changing type for slave_net_timeout from ulong to uint sql/sys_vars.cc: Refining the max value for slave_net_timeout to be as the max for uint type.	16 years ago
Dmitry Lenev	6b5c4a9ef6	Fix for bug #51105 "MDL deadlock in rqg_mdl_stability test on Windows". On platforms where read-write lock implementation does not prefer readers by default (Windows, Solaris) server might have deadlocked while detecting MDL deadlock. MDL deadlock detector relies on the fact that read-write locks which are used in its implementation prefer readers (see new comment for MDL_lock::m_rwlock for details). So far MDL code assumed that default implementation of read/write locks for the system has this property. Indeed, this turned out ot be wrong, for example, for Windows or Solaris. Thus MDL deadlock detector might have deadlocked on these systems. This fix simply adds portable implementation of read/write lock which prefer readers and changes MDL code to use this new type of synchronization primitive. No test case is added as existing rqg_mdl_stability test can serve as one. config.h.cmake: Check for presence of pthread_rwlockattr_setkind_np to be able to determine if system natively supports read-write locks for which we can specify if readers or writers should be preferred. configure.cmake: Check for presence of pthread_rwlockattr_setkind_np to be able to determine if system natively supports read-write locks for which we can specify if readers or writers should be preferred. configure.in: Check for presence of pthread_rwlockattr_setkind_np to be able to determine if system natively supports read-write locks for which we can specify if readers or writers should be preferred. include/my_pthread.h: Added support for portable read-write locks which prefer readers. To do so extended existing my_rw_lock_t implementation to support selection of whom to prefer depending on a flag. mysys/thr_rwlock.c: Extended existing my_rw_lock_t implementation to support selection of whom to prefer depending on a flag. Added rw_pr_init() function implementing initialization of read-write locks preferring readers. sql/mdl.cc: Use portable read-write locks which prefer readers instead of relying on that system implementation of read-write locks has this property (this was true for Linux/NPTL but was false, for example, for Windows and Solaris). Added comment explaining why preferring readers is important for MDL deadlock detector (thanks to Serg for example!). sql/mdl.h: Use portable read-write locks which prefer readers instead of relying on that system implementation of read-write locks has this property (this was true for Linux/NPTL but was false, for example, for Windows and Solaris).	16 years ago
Konstantin Osipov	093106f552	WL#5000 FLUSH TABLES\|TABLE table_list WITH READ LOCK. Extend and implement the grammar that allows to FLUSH WITH READ LOCK a list of tables, rather than all of them. Incompatible grammar change: Previously one could perform FLUSH TABLES, HOSTS, PRIVILEGES in a single statement. After this change, FLUSH TABLES must always be alone on the list. Judging by the test suite, however, the old extended syntax was never or very rarely used. The new statement requires RELOAD ACL global privilege and LOCK_TABLES_ACL \| SELECT_ACL on individual tables. In other words, it's an atomic combination of LOCK TALBES <list> READ and FLUSH TABLES <list>, and requires respective privileges. For additional information about the semantics, please see WL#5000 and the comment for flush_tables_with_read_lock() function in sql_parse.cc mysql-test/r/flush.result: Update test results (WL#5000). mysql-test/t/flush.test: Add test coverage for WL#5000. sql/sql_yacc.yy: Allow FLUSH TABLES <table_list> WITH READ LOCK. Disallow FLUSH TABLES <table_list>, flush_options.	16 years ago
Vladislav Vaintroub	4761a651a1	merge	16 years ago
Marc Alff	d6131618bb	Bug#51447 performance schema evil twin files Before this fix, the performance schema file instrumentation would treat: - a relative path to a file - an absolute path to the same file as two different files. This would lead to: - separate aggregation counters - file leaks when a file is removed. With this fix, a relative and absolute path are resolved to the same file instrument.	16 years ago
Dmitry Lenev	88f4990c33	Merged recent changes from mysql-next-mr-bugfixing into mysql-next-4284 tree.	16 years ago
Jonathan Perkin	33ecac14f7	Fix truncated GPL text.	16 years ago
Dmitry Lenev	aedf25be59	Merge recent changes from mysql-next-mr into mysql-next-4284.	16 years ago
Dmitry Lenev	cb7fe1347c	Merged recent changes from mysql-next-mr-bugfixing into mysql-next-4284 tree.	16 years ago
Jon Olav Hauglid	7fd30bf610	Bug #51240 ALTER TABLE of a locked MERGE table fails The problem was that ALTER TABLE on a merge table which was locked using LOCK TABLE ... WRITE, by mistake gave ER_TABLE_NOT_LOCKED_FOR_WRITE. During opening of the table to be ALTERed, open_table() tried to get an upgradable metadata lock. In LOCK TABLEs mode, this lock must already exist (i.e. taken by LOCK TABLE) as new locks of this type cannot be acquired for fear of deadlock. So in LOCK TABLEs mode, open_table() tried to find an existing upgradable lock for the table to be altered. The problem was that open_table() also tried to find upgradable metadata locks for children of merge tables even if no such locks are needed to execute ALTER TABLE on merge tables. This patch fixes the problem by making sure that open tables code only searches for upgradable metadata locks for the merge table and not for the merge children tables. The patch also fixes a related bug where an upgradable metadata lock was aquired outside of LOCK TABLEs mode even if the table in question was temporary. This bug meant that LOCK TABLES or DDL on temporary tables by mistake could be blocked/aborted by locks held on base tables with the same table name by other connections. Test cases added to merge.test and lock_multi.test.	16 years ago
Jon Olav Hauglid	a42cbe060c	Bug #51336 Assert in reload_acl_and_cache during RESET QUERY CACHE Attempts to execute RESET statements within a transaction that had acquired metadata locks, led to an assertion failure on debug servers. This bug didn't cause any problems on release builds. The triggered assert is designed to check that caches are not flushed or reset while having active transactions. It is triggered if acquired metadata locks exist that are not from LOCK TABLE or HANDLER statements. In this case it was triggered by RESET QUERY CACHE while having an active transaction that had acquired locks. The reason the assertion was triggered, was that RESET statements, unlike the similar FLUSH statements, was not causing an implicit commit. This patch fixes the problem by making sure RESET statements commit the current transaction before executing. The commit causes acquired metadata locks to be released, preventing the assertion from being triggered. Incompatible change: This patch changes RESET statements so that they cause an implicit commit. Test case added to query_cache.test.	16 years ago
Alexander Nozdrin	2f4e94d7c2	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	242a5a945f	Disable rpl_semi_sync on Windows due to Bug 49557.	16 years ago
Vladislav Vaintroub	0b627c7163	merge	16 years ago
Vladislav Vaintroub	3fcd854852	Bug#51502: building with cmake creates an invalid mysqld_safe. The problem was incorrect escaping used inside a strnig : in \"$MYSQLD\" was written as "\MYSQL\" (backslash and quote characters transposed), when defining FIND_PROC variable for BSD or SysV style "ps" command- Additionally fixed obvious code duplication and random naming in CHECK_PID test.	16 years ago
Alexander Nozdrin	c358da1b5c	Null-merge from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	a77f929716	Null-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	5143331ca4	Null-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	49e7114fdb	Fix default.conf.	16 years ago
Alexander Nozdrin	b1fbd77e38	Fix default.conf.	16 years ago
Jon Olav Hauglid	3f1a9baf0b	Bug #51355 handler stmt cause assertion in bool MDL_context::try_acquire_lock(MDL_request*) This assert was triggered in the following way: 1) HANDLER OPEN t1 from connection 1 2) DROP TABLE t1 from connection 2. This will block due to the metadata lock held by the open handler in connection 1. 3) DML statement (e.g. INSERT) from connection 1. This will close the table opened by the HANDLER in 1) and release its metadata lock. This is done due to the pending exclusive metadata lock from 2). 4) DROP TABLE t1 from connection 2 now completes and removes table t1. 5) HANDLER READ from connection 1. Since the handler table was closed in 3), the handler code will try to reopen the table. First a new metadata lock on t1 will be granted before the command fails since the table was removed in 4). 6) HANDLER READ from connection 1. This caused the assert. The reason for the assert was that the MDL_request's pointer to the lock ticket was not reset when the statement failed. HANDLER READ then tried to acquire a lock using the same MDL_request object, triggering the assert. This bug was only noticeable on debug builds and did not cause any problems on release builds. This patch fixes the problem by assuring that the pointer to the metadata lock ticket is reset when reopening of handler tables fails. Test case added to handler.inc	16 years ago
Vladislav Vaintroub	46800354ab	Workaround crash with dtraced shared libraries under GCC 3.4.6 on 32 bit Solaris. Crash happens in dlopen() code when trying to load the library. Crash does not happen when library is not DTrace instrumented . Additionally, crash does not happen with default Solaris 10 GCC 3.4.3 and it does not happen if main executable is instrumented. So , just check for this specific situation (32 bit, GCC3.4.6 , Solaris) and disable Dtrace in shared libraries. We have only single plugin so far that is instrumented (ha_example)	16 years ago
Jon Olav Hauglid	8a5956c928	merge from mysql-next-mr-bugfixing	16 years ago
Alexey Botchkov	c510ded6a4	Bug#41103 6.0 Windows embedded-server tests fail Two problems addressed here: Embedded-server linking failure. sql/sys_vars.cc absents in the libmysqld/CMakeLists.txt The PERFORMANCE_SCHEMA-related failure of the embedded-server compilation. We try to disable the PERFORMANCE_SCHEMA in the embedded server as it's considered useless there. But we do it in wrong way as we only disable header's links to the PF, not the PF's library itself. So on Unix-ex the embedded library still contains the PF code and grows bigger with no reason. On Windows that just fails to compile. per-file comments: include/my_global.h Bug#41103 6.0 Windows embedded-server tests fail No PERFORMANCE_SCHEMA disabling in the embedded server. User can just use the --without-perfschema-engine-plugin option to exclude it from the compilation.	16 years ago
Vladislav Vaintroub	527ff458aa	On Solaris, overwrite CMake's proposed thread library -lthread with -lpthread. -lthread works fine in most cases, but at least with gcc 3.4.6 on x86, dlopen() crashes when libpthread is not used. Note : the workaround existed prior and did not work since CMAKE_THREADS_LIBS_INIT was already in cache. Now, use SET(.. CACHE FORCE) to overwrite the cached value.	16 years ago
Vladislav Vaintroub	aa52602008	merge	16 years ago
Jonathan Perkin	46b22d5e5d	Some CMake packaging fixes: - Remove INSTALL-BINARY from installed docs directory, we provide a copy in the root directory (but perhaps this should be revisited later). - Disable audit_null and daemon_example plugins. - Fix the docs directory. - Remove mysql-test/Makefile.in - Build and install mysql_tzinfo_to_sql - Remove share/charsets/languages.html	16 years ago
Vladislav Vaintroub	bcebd97306	#51466 : Source packages are broken with cmake in a cmake-agnostic environment In the worst case possible scenario (no bzr, in-source build), make dist produced a package that compiled ok with autotools but failed to package because extra make_binary_distribution was found in source package and was not built. make_binary_distribution contained paths of the build machine. Fix: exclude some scripts that are produced in cmake build. Note that there is no good general fix for it in this specific scenario. it is advisable to build source packages out of source or in bzr repo.	16 years ago
Vladislav Vaintroub	60c7cc878f	Fix --with-ssl mappping (--with-ssl=dir should be "yes" or actually "system"), --with-ssl should be "bundled". Fixes error on sol-gcc-x86, where build machine had openssl but not the test box.	16 years ago
Jon Olav Hauglid	e60ef89317	Followup to Bug#45225 Locking: hang if drop table with no timeout This patch prevents system threads and system table accesses from using user-specified values for "lock_wait_timeout". Instead all such accesses are done using the default value (1 year). This prevents background tasks (such as replication, events, accessing stored function definitions, logging, reading time-zone information, etc.) from failing in cases where the global value of "lock_wait_timeout" is set very low. The patch also simplifies the open tables API. Rather than adding another convenience function for opening and locking system tables, this patch removes most of the existing convenience functions for open_and_lock_tables_derived(). Before, open_and_lock_tables() was a convenience function that enforced derived tables handling, while open_and_lock_tables_derived() was the main function where derived tables handling was optional. Now, this convencience function is gone and the main function is renamed to open_and_lock_tables(). No test case added as it would have required the use of --sleep to check that system threads and system tables have a different timeout value from the user-specified "lock_wait_timeout" system variable.	16 years ago
Alexander Nozdrin	a54c49b074	Update result file for funcs_1.storedproc.	16 years ago
Marc Alff	f5070c2616	Fixed tests for windows	16 years ago
Vladislav Vaintroub	5994f28470	merge	16 years ago
Vladislav Vaintroub	0faa8ef87a	Fix typo HAVE_IBGCC_ATOMIC_BUILTINS=>HAVE_IB_GCC_ATOMIC_BUILTINS. Due to the typo, detection of atomics was broken. It also lead to valgrind error during shutdown (access to freed memory),which is likely present in all builds where atomics are not used.	16 years ago

1 2 3 4 5 ...

61167 Commits (cd03a4625fbf481deeb6c32c8cb6ff74d900098b) All Branches Search

61167 Commits (cd03a4625fbf481deeb6c32c8cb6ff74d900098b)

All Branches