mariadb

Tree: 2ed99fbe1c

Author	SHA1	Message	Date
Ingo Struewing	2ed99fbe1c	Bug#37958 - test main.plugin crash on Mac OS X when selecting from EXAMPLE engine. This patch contains fixes for two problems: 1. As originally reported, the server crashed on Mac OS X when trying to access an EXAMPLE table after the EXAMPLE plugin was installed. It turned out that the dynamically loaded EXAMPLE plugin called the function hash_earch() from a Mac OS X system library, instead of hash_earch() from MySQL's mysys library. Makefile.am in storage/example does not include libmysys. So the Mac OS X linker arranged the hash_search() function to be linked to the system library when the shared object is loaded. One possible solution would be to include libmysys into the linkage of dynamic plugins. But then we must have a libmysys.so, which must be used by the server too. This could have a minimal performance impact, but foremost the change seems to bee too risky at the current state of MySQL 5.1. The selected solution is to rename MySQL's hash_search() to my_hash_search() like it has been done before with hash_insert() and hash_reset(). Since this is the third time, we need to rename a hash_() function, I did renamed all hash_() functions to my_hash_(). To avoid changing a zillion calls to these functions, and announcing this to hundreds of developers, I added defines that map the old names to the new names. This change is in hash.h and hash.c. 2. The other problem was improper implementation of the handlerton-to-plugin mapping. We use a fixed-size array to hold a plugin reference for each handlerton. On every install of a handler plugin, we allocated a new slot of the array. On uninstall we did not free it. After some uninstall/install cycles the array overflowed. We did not check for overflow. One fix is to check for overflow to stop the crashes. Another fix is to free the array slot at uninstall and search for a free slot at plugin install. This change is in handler.cc. include/hash.h: Bug#37958 - test main.plugin crash on Mac OS X when selecting from EXAMPLE engine. Renamed hash_() functions to my_hash_(). Added defines that map old names to new names. mysys/hash.c: Bug#37958 - test main.plugin crash on Mac OS X when selecting from EXAMPLE engine. Renamed hash_() functions to my_hash_*(). sql/handler.cc: Bug#37958 - test main.plugin crash on Mac OS X when selecting from EXAMPLE engine. Protect against a failing ha_initialize_handlerton() in ha_finalize_handlerton(). Free hton2plugin slot on uninstall of a handler plugin. Reuse freed slost of the hton2plugin array. Protect against array overrun.	17 years ago
Patrick Crews	6db425ab4c	automerge	17 years ago
Patrick Crews	006b940a27	Bug#38311 Some tests use 'rm' which is not portable Repush of change to fix tests on Pushbuild.	17 years ago
Davi Arnaut	37a6be753f	Merge from main branch.	17 years ago
Davi Arnaut	36d8535a4f	Bug#38727: BUILD/compile-solaris-* scripts should compile MySQL with libmtmalloc Link with mtmalloc on Solaris as it is done in our release builds. Replace deprecated flag with the newer option as already done in other scripts. BUILD/compile-solaris-amd64-forte: Link to mtmalloc and replace deprecated flag. BUILD/compile-solaris-amd64-forte-debug: Replace deprecated flag. BUILD/compile-solaris-sparc: Link to mtmalloc. BUILD/compile-solaris-sparc-forte: Link to mtmalloc	17 years ago
Patrick Crews	e97a45fdd3	automerge	17 years ago
Patrick Crews	446fd5044c	Merge 5.0 -> 5.1	17 years ago
Patrick Crews	8c33da076e	Automerge	17 years ago
Gleb Shchepa	0d24398697	manual merge 5.0-bugteam --> 5.1-bugteam	17 years ago
Gleb Shchepa	3c9d4ea821	Fixed bug #17823 : 'arc' directories inside database directories. Server created "arc" directories inside database directories and maintained there useless copies of .frm files. Creation and renaming procedures of those copies as well as creation of "arc" directories has been discontinued. Removal procedure has been kept untouched to be able to cleanup existent database directories by the DROP DATABASE query. Also view renaming procedure has been updated to remove these directories. sql/parse_file.cc: Fixed bug #17823: 'arc' directories inside database directories. View/table creation and renaming procedures maintained backup copies of .frm files. Those copies are unused yet, so this feature was incomplete and unnecessary. 1. Unwanted code has been hidden by FRM_ARCHIVE ifdefs (the FRM_ARCHIVE macro is not defined). 2. Renaming procedure has been modified to remove obsolete "arc" directories. sql/parse_file.h: Fixed bug #17823: 'arc' directories inside database directories. The "thd" parameter has been added to the rename_in_schema_file() function. sql/sql_db.cc: Fixed bug #17823: 'arc' directories inside database directories. Scope of the mysql_rm_arc_files() function has been changed to global for use from the parse_file.cc file. sql/sql_view.cc: Fixed bug #17823: 'arc' directories inside database directories. Added the "thd" argument to rename_in_schema_file() calls.	17 years ago
Alexey Botchkov	b8734a1ce2	merging	17 years ago
Alexey Botchkov	ce64a16b75	Bug#37949 Crash if argument to SP is a subquery that returns more than one row JOIN for the subselect wasn't cleaned if we came upon an error during sub_select() execution. That leads to the assertion failure in close_thread_tables() part of the 6.0 code backported per-file comments: mysql-test/r/sp-error.result Bug#37949 Crash if argument to SP is a subquery that returns more than one row test result mysql-test/t/sp-error.test Bug#37949 Crash if argument to SP is a subquery that returns more than one row test case sql/sp_head.cc Bug#37949 Crash if argument to SP is a subquery that returns more than one row lex->unit.cleanup() call added if not substatement	17 years ago
Kristofer Pettersson	1e26e74c2a	Automerge	17 years ago
Patrick Crews	f5c1c9af8e	Bug#38311 - Fix of some cruft from remove_files in ndb_autodiscover.test, clean up of distinct.test, and replacing error numbers with error names.	17 years ago
Mattias Jonsson	1d583e50d8	merge	17 years ago
Patrick Crews	39fe58a07e	merge of changes	17 years ago
Patrick Crews	e411b5f595	Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust Trimmed some error-prone and variable portions of the test and added 'flush status' to ensure deterministic test	17 years ago
Magnus Svensson	a50eed3a27	Bug #37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust mysql-test/lib/mtr_cases.pl: forward port the algorithm to check if a binlog format is supported mysql-test/mysql-test-run.pl: Don't use dynamic setting of binlog format - does not work	17 years ago
Kristofer Pettersson	153e8e7c07	Merge 5.0-bugteam -> 5.1-bugteam	17 years ago
Kristofer Pettersson	119c5aaeba	Automerge	17 years ago
Kristofer Pettersson	f0352e346a	Bug#38469 invalid memory read and/or crash with utf8 text field, stored procedure, uservar A stored procedure involving substrings could crash the server on certain platforms because of invalid memory reads. During storing the new blob-field value, the cached value's address range overlapped that of the new field value. This caused problems when the cached value storage was reallocated to provide access for a new characater set representation. The patch checks the address ranges, and if they overlap, the new field value is copied to a new storage before it is converted to the new character set. mysql-test/r/sp.result: Added result set mysql-test/t/sp.test: Added test case sql/field.cc: The source and destination address ranges of a character conversion must not overlap or the 'from' address will be invalidated as the temporary value- object is re-allocated to fit the new character set. sql/field.h: Added comments	17 years ago
Davi Arnaut	fa490eb933	Restore team tree name.	17 years ago
Patrick Crews	404e4b802c	Bug#38311 Some tests use 'rm' which is not portable Substituted use of MTR's remove_file function in the tests Started with 5.0 tree and will clean up any offenders discovered during upmerge.	17 years ago
Matthias Leich	88ec0a0ce8	Merge 5.0 -> 5.1 no conflicts, no real code changes	17 years ago
Matthias Leich	24fe747024	Merge actual tree -> local tree no conflicts	17 years ago
Matthias Leich	8aa1b6b02e	Merge actual bugteam tree -> local tree	17 years ago
Tatiana A. Nurnberg	1f4277b42b	auto-merge	17 years ago
Tatiana A. Nurnberg	7a40f2610e	manual merge	17 years ago
Tatiana A. Nurnberg	654db75dfb	Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE tweaked test to make embedded server happy	17 years ago
Mattias Jonsson	84760783e9	Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) It is a very big test and as such it takes a lot of time. Solution is to divide the test in two parts, one for testing increasing column size and one for decreasing size. The innodb branch does extended tests (that myisam is not) due to the $do_pk_tests variabel, that is the reason why the innodb branch takes longer. No increase of memory usage in innodb was found when analyzing, (tested with looping some millions time of create/drop and alter commands) The memory exhaust discovered in the test is due to mysqltest which stores the result in memory (result-file) and this was the biggest result file in the test framework, so by dividing the test into two parts also cuts the memory usage of mysqltest. mysql-test/suite/parts/inc/partition_alter2_1.inc: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/inc/partition_alter2_2.inc: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_1_innodb.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_1_myisam.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_2_innodb.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_2_myisam.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/disabled.def: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Removed the test completely (since it has never been supported) mysql-test/suite/parts/t/partition_alter2_1_innodb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_1_myisam.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_2_innodb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_2_myisam.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_ndb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Removing test since ndb has never supported these tests	17 years ago
Chad MILLER	cf2b5e8b5b	Merge Bug#37312.	17 years ago
Tatiana A. Nurnberg	c8324002e2	auto-merge	17 years ago
Tatiana A. Nurnberg	8d10051b9a	auto-merge	17 years ago
Tatiana A. Nurnberg	845d7c71b1	auto-merge	17 years ago
Tatiana A. Nurnberg	2f082d9d42	Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE NO_BACKSLASH_ESCAPES was not heeded in LOAD DATA INFILE and SELECT INTO OUTFILE. It is now. mysql-test/r/loaddata.result: Show that SQL-mode NO_BACKSLASH_ESCAPES is heeded in INFILE/OUTFILE, and that dump/restore cycles work! mysql-test/t/loaddata.test: Show that SQL-mode NO_BACKSLASH_ESCAPES is heeded in INFILE/OUTFILE, and that dump/restore cycles work! sql/sql_class.cc: Add function to enquire whether ESCAPED BY was given. When doing SELECT...OUTFILE, use ESCAPED BY if specifically given; otherwise use sensible default value depending on SQL-mode features NO_BACKSLASH_ESCAPES. sql/sql_class.h: Add function to enquire whether ESCAPED BY was given. sql/sql_load.cc: When doing LOAD DATA INFILE, use ESCAPED BY if specifically given; otherwise use sensible default value depending on SQL-mode features NO_BACKSLASH_ESCAPES.	17 years ago
Matthias Leich	03703b65df	Upmerge 5.0 -> 5.1 of fix for Bug#38184	17 years ago
Matthias Leich	635887dcee	Fix for Bug#38184 : main.federated fails sporadically Details: - backport of some improvements which prevent sporadic failures from 5.1 to 5.0 - @@GLOBAL.CONCURRENT_INSERT= 0 also for slave server - --sorted_result before all selects which have result sets with more than one row - Replace error numbers by error names	17 years ago
Narayanan V	53e0108387	updated tree with mysql-5.1-bugteam	17 years ago
Vladislav Vaintroub	f6e28fd538	merge fix from 5.0-bugteam	17 years ago
Narayanan V	d714d29058	Bug#38338: REPLACE causes last_insert_id() to return an incorrect value Fix the write_record function to record auto increment values in a consistent way. mysql-test/r/auto_increment.result: Updated the test result file with the output of the new test case added to verify this bug. mysql-test/t/auto_increment.test: Added a new test case to verify this bug. sql/sql_insert.cc: The algorithm for the write_record function in sql_insert.cc is (more emphasis given to the parts that deal with the autogenerated values) 1) If a write fails 1.1) save the autogenerated value to avoid thd->insert_id_for_cur_row to become 0. 1.2) <logic to handle INSERT ON DUPLICATE KEY UPDATE and REPLACE> 2) record the first successful insert id. explanation of the failure -------------------------- As long as 1.1) was executed 2) worked fine. 1.1) was always executed when REPLACE worked with the last row update optimization, but in cases where 1.1) was not executed 2) would fail and would result in the autogenerated value not being saved. solution -------- repeat a check for thd->insert_id_for_cur_row being zero similar to 1.1) before 2) and ensure that the correct value is saved.	17 years ago
Vladislav Vaintroub	a4987b4433	Bug#35987 - post-review fix Correct usage of strncat() in get_symbol_path() 3rd parameter to strncat is changed to be count of remaining bytes in the output buffer minus 1.	17 years ago
Kristofer Pettersson	4f3d241b28	Automerge	17 years ago
Patrick Crews	0ba9459496	merge of bug fix from parent	17 years ago
Patrick Crews	f2ea573869	Bug#37938 Test "mysqldump" lacks various INSERT statements / values Merge of fixes from 5.0 -> 5.1 Moved restoration of concurrent_insert's original value to the end of the 5.1 tests Re-recorded .result file to account for changes to test file.	17 years ago
Patrick Crews	ebd3a6e452	Bug#37938 Test "mysqldump" lacks various INSERT statements / values Moved fix for this bug to 5.0 as other mysqldump bugs seem tied to concurrent_insert being on Setting concurrent_insert off during this test as INSERTs weren't being completely processed before the calls to mysqldump, resulting in failing tests. Altered .test file to turn concurrent_insert off during the test and to restore it to whatever the value was at the start of the test when complete. Re-recorded .result file to account for changes to variables in the test.	17 years ago
Patrick Crews	7eb271ba43	Bug#39803 Test rpl.rpl_truncate_7ndb_2 failing Fixed bad path in .test file Moved test to suite/rpl_ndb (per Cluster QA) Re-recorded .result file to updated expected results.	17 years ago
Vladislav Vaintroub	26c48a8089	merge fix for 35987	17 years ago
Vladislav Vaintroub	5343b7ae59	Bug#35987 - crash report on windows doesn't resolve stack traces. The problem here is that symbols can not be loaded, because symbol path is not set and default path does not include the directory where PDB is located. The problem is _not_ reproducible on the same machine where mysqld.exe is built - if PDB is not found in the symbol path, dbghelp would fallback to fully qualified PDB path as given in the executable header and on the build host this will succeed. The solution is to calculate symbol path and pass it to SymInitialize() call.	17 years ago
Alexander Barkov	94fad7c0c2	Bug#35720 ucs2 + pad_char_to_full_length = failure Problem: with @@sql_mode=pad_char_to_full_length a CHAR column returned additional garbage after trailing space characters due to incorrect my_charpos() call. Fix: call my_charpos() with correct arguments.	17 years ago
Martin Skold	08421a83ba	bug #31231 mysql_alter_table() tries to drop a non-existing table bug#31233 mysql_alter_table() fails to drop UNIQUE KEY mysql-test/suite/ndb/r/ndb_alter_table.result: bug#31233 mysql_alter_table() fails to drop UNIQUE KEY: added test cases mysql-test/suite/ndb/t/ndb_alter_table.test: bug#31233 mysql_alter_table() fails to drop UNIQUE KEY: added test cases sql/ha_ndbcluster.cc: bug#31233 mysql_alter_table() fails to drop UNIQUE KEY: Removed check for non-pk tables, not needed when mysql_alter_table checks apropriate flags sql/mysql_priv.h: bug #31231 mysql_alter_table() tries to drop a non-existing table: added FRM_ONLY flag sql/sql_table.cc: bug #31231 mysql_alter_table() tries to drop a non-existing table Don't invoke handler for tables defined with FRM_ONLY flag. bug#31233 mysql_alter_table() fails to drop UNIQUE KEY When a table is defined without an explicit primary key mysql will choose the first found unique index defined over non-nullable fields (if such an index exists). This means that if such an index is added (the first) or dropped (the last) through an alter table, this equals adding or dropping a primary key. The implementation for on-line add/drop index did not consider this semantics. This patch ensures that only handlers with the correctly defined flags (see handler.h for explanation of the flags): HA_ONLINE_ADD_PK_INDEX HA_ONLINE_ADD_PK_INDEX_NO_WRITES HA_ONLINE_DROP_PK_INDEX HA_ONLINE_DROP_PK_INDEX_NO_WRITES are invoked for such on-line operations. All others handlers must perform a full (offline) alter table.	17 years ago

1 2 3 4 5 ...

54840 Commits (2ed99fbe1c73566dfed72a5d03bceb4705f45bc9) All Branches Search

54840 Commits (2ed99fbe1c73566dfed72a5d03bceb4705f45bc9)

All Branches