mariadb

Tree: 10ae3ae1c8

Author	SHA1	Message	Date
Mattias Jonsson	642bf9022a	manual merge of bug#37402	18 years ago
He Zhenxing	44d0fcddf1	Apply tomas's patch to fix rpl_row_basic.test, this can fix BUG#37884, BUG#38369, enable rpl_row_basic_7ndb test	18 years ago
Mattias Jonsson	bdab488391	Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated result files after merge mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated result file after merge mysql-test/suite/parts/t/disabled.def: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Enabled two tests after fixing the bug.	18 years ago
Davi Arnaut	88d10290e7	Merge mysql-5.0-bugteam into mysql-5.1-bugteam	18 years ago
Davi Arnaut	1912eaacc4	Bug#38486: Crash when using cursor protocol Post-merge fix: mysql_client_test.c is compiled by C compilers and some C compilers don't support mixed declarations and code and it's explicitly forbidden by ISO C90. tests/mysql_client_test.c: Don't mix declarations and code.	18 years ago
Marc Alff	7f228cf20e	Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam Note: NULL merge of sql/sql_yacc.yy, the fix for bug#38296 will be provided separately for 5.1	18 years ago
Marc Alff	2f3b860305	Merge mysql-5.0-bugteam -> local bugfix branch	18 years ago
Marc Alff	b4418b5c3a	Bug#37302 (missing DBUG_RETURN macro in function "find_key_block" (5.0 only)) Fixed missing DBUG_RETURN in the function find_key_block	18 years ago
Mattias Jonsson	1c06de1fd6	manual merge of Bug#20129 into 5.1-bugteam	18 years ago
Mattias Jonsson	f50c4207f2	Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt The main problem was that ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION took another code path (over mysql_alter_table instead of mysql_admin_table) which differs in two ways: 1) alter table opens the tables in a different way than admin tables do resulting in returning with error before it tried the command 2) alter table does not start to send any diagnostic rows to the client which the lower admin functions continue to use -> resulting in assertion crash The fix: Remapped ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION to use the same code path as ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE t. Adding check in mysql_admin_table to setup the partition list for which partitions that should be used. Partitioned tables will still not work with REPAIR TABLE/PARTITION USE_FRM, since that requires moving partitions to tables, REPAIR TABLE t USE_FRM, and check that the data still fulfills the partitioning function and then move the table back to being a partition. NOTE: I have removed the following functions from the handler interface: analyze_partitions, check_partitions, optimize_partitions, repair_partitions Since they are not longer needed. THIS ALTERS THE STORAGE ENGINE API mysql-test/r/handler_innodb.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/r/innodb.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/r/innodb_mysql.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/r/partition.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/r/trigger-trans.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/suite/ndb/r/ndb_partition_key.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/ndb/t/ndb_partition_key.test: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/parts/inc/partition_alter4.inc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/parts/r/partition_alter4_innodb.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/parts/r/partition_alter4_myisam.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/rpl/r/rpl_failed_optimize.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/t/partition.test: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. sql/ha_partition.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a function for returning admin commands result rows Updated handle_opt_partitions to handle admin commands result rows, and some error filtering (as mysql_admin_table do). Removed the functions analyze/check/optimize/repair_partitions since they have no longer any use. sql/ha_partition.h: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Removed analyze/check/optimize/repair_partitions since they are no longer are needed. sql/handler.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Removed analyze/check/optimize/repair_partitions since they are no longer are needed. sql/handler.h: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Removed analyze/check/optimize/repair_partitions since they are no longer are needed. sql/mysql_priv.h: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added set_part_state for reuse of code in mysql_admin_table. (Originally fond in sql/sql_partition.cc:prep_alter_part_table) sql/protocol.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added one assert and a debug print. sql/sql_partition.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Refactored code for setting up partition state, set_part_state, now used in both prep_alter_part_table and sql_table.cc:mysql_admin_table. Removed code for handling ANALYZE/CHECK/OPTIMIZE/REPAIR partitions, since it is now handled by mysql_admin_table. sql/sql_table.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added functionality in mysql_admin_table to work with partitioned tables. Fixed a possible assertion bug for HA_ADMIN_TRY_ALTER (If analyze would output a row, it fails since the row was already started). sql/sql_yacc.yy: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Remapped ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION to use the same code path as ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE instead of taking the ALTER TABLE path. Added reset of alter_info for ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE since it is now used by partitioned tables. storage/myisam/mi_check.c: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Changed warning message from "Found X parts Should be: Y parts" to "Found X key parts. Should be Y", since it could be confusing with partitioned tables.	18 years ago
Chad MILLER	26ed51d095	Merge from bugteam 5.0 trunk.	18 years ago
Marc Alff	e04dfffb59	Bug#38296 (low memory crash with many conditions in a query) This fix is for 5.0 only : back porting the 6.0 patch manually The parser code in sql/sql_yacc.yy needs to be more robust to out of memory conditions, so that when parsing a query fails due to OOM, the thread gracefully returns an error. Before this fix, a new/alloc returning NULL could: - cause a crash, if dereferencing the NULL pointer, - produce a corrupted parsed tree, containing NULL nodes, - alter the semantic of a query, by silently dropping token values or nodes With this fix: - C++ constructors are not executed with a NULL "this" pointer when operator new fails. This is achieved by declaring "operator new" with a "throw ()" clause, so that a failed new gracefully returns NULL on OOM conditions. - calls to new/alloc are tested for a NULL result, - The thread diagnostic area is set to an error status when OOM occurs. This ensures that a request failing in the server properly returns an ER_OUT_OF_RESOURCES error to the client. - OOM conditions cause the parser to stop immediately (MYSQL_YYABORT). This prevents causing further crashes when using a partially built parsed tree in further rules in the parser. No test scripts are provided, since automating OOM failures is not instrumented in the server. Tested under the debugger, to verify that an error in alloc_root cause the thread to returns gracefully all the way to the client application, with an ER_OUT_OF_RESOURCES error.	18 years ago
Chad MILLER	b0d5c8a10b	null-merge of backported changes.	18 years ago
Chad MILLER	b615e3d535	Backport compiler warning fix from 5.1-bugteam.	18 years ago
Mattias Jonsson	2ace7dc939	merge into an updated 5.1-bugteam tree	18 years ago
Davi Arnaut	1c108906c6	Post-merge fix: Remove Remove unused variable. client/mysql_upgrade.c: Remove Remove unused variable.	18 years ago
Davi Arnaut	d622b04f39	Post-merge fix: Silence warning due to type mismatch. client/mysql_upgrade.c: Silence warning due to type mismatch.	18 years ago
Kristofer Pettersson	2c01793a73	Null merging 5.0->5.1; Changeset is a back port.	18 years ago
Kristofer Pettersson	861c06f0b8	Automerge	18 years ago
Kristofer Pettersson	75a5ecbd72	Bug#38486 Crash when using cursor protocol Server side cursors were not initialized properly and this caused a reference to uninitialized memory.	18 years ago
Timothy Smith	5d036ff311	Up-merge test case for bug 35220 from 5.0 (no real code changes).	18 years ago
Timothy Smith	9d9fa39b97	Cherry-pick fix for Bug#35220 from innodb-5.0-ss2475 snapshot. Bug#35220: ALTER TABLE too picky on reserved word "foreign" In ALTER TABLE, change the internal parser to search for ``FOREIGN[[:space:]]'' instead of only ``FOREIGN'' when parsing ALTER TABLE ... DROP FOREIGN KEY ...; otherwise it could be mistaken with ALTER TABLE ... DROP foreign_col; (This fix is already present in MySQL 5.1 and higher.)	18 years ago
Chad MILLER	b37814ef04	Merge from bugteam trunk.	18 years ago
Chad MILLER	9d2e311b6b	merge from local 5.0 fix tree.	18 years ago
Chad MILLER	abeda651c5	Bug#31605: mysql_upgrade relies on Linux /proc filesystem when not \ running on Windows We used two OS-specific methods of looking up the executable name, which don't work outside of those two kinds of OSes (Linux+Solaris and Windows). We assume that if the user ran this program with a certain name, we can run the other sibling programs with a similar name. (re-patch in bzr)	18 years ago
Davi Arnaut	130ab95a54	Bug#21226 FLUSH PRIVILEGES does not provided feedback when it fails. Post-merge fix: remove spurious semicolon that caused the function to return failure regardless of the outcome. sql/sql_parse.cc: Remove spurious semicolon.	18 years ago
Chad MILLER	2c933391f6	Better fix of build-tags, merged from local 5.0-bugteam .	18 years ago
Chad MILLER	82d13392eb	Bug#37201: make tags doesn't work in bazaar server trees Fall back to "find" if bzr is unavailable. Don't fail for paths that have spaces in them.	18 years ago
Chad MILLER	d771e0148d	Merge from local 5.0-bugteam.	18 years ago
Chad MILLER	93df483fdd	Bug#37201: make tags doesn't work in bazaar server trees bk sfiles -> bzr ls	18 years ago
Kristofer Pettersson	857a0d6461	Manual merge 5.0->5.1	18 years ago
Sven Sandberg	0623864f34	merged 5.1 main -> 5.1-rpl-testfixes all files automerged without conflict	18 years ago
Chad MILLER	ff577e3590	Bug#30129: mysql_install_db appears to run normally, but the databases \ are not created {Netware} The init and test sql files were not created at cross-compilation time. Now, make them in the default build rule. Additionally, remove the "fix" SQL instructions, which are unnecessary for newly initialized databases. Also, clean up the english in an error message, and BZRify nwbootstrap.	18 years ago
Kristofer Pettersson	be7d4dc8ee	automerge	18 years ago
Davi Arnaut	b757f48565	Bug#37003: Tests sporadically crashes with embedded server Post-merge fix: Alter linking order so that the thread linking flags appear last in the list. This needs to be done this way because some linkers will not search the thread archive again if a undefined symbol (pthread_kill in this case) appears later. client/Makefile.am: Link mysys before thread libs.	18 years ago
Timothy Smith	00940891b0	NULL MERGE of innodb-5.0-ss2475 snapshot cherry-pick (bugs: 34286, 35352, 36600) These changes, where applicable, are available in 5.1-specific snapshots for MySQL 5.1+.	18 years ago
Timothy Smith	dc593c3ec4	Cherry-pick InnoDB fixes for Bug#34286, Bug#35352, and Bug#36600 from snapshot innodb-5.0-ss2475. Bug #34286 Assertion failure in thread 2816 in file .\row\row0sel.c line 3500 Since autoinc init performs a MySQL SELECT query to determine the auto-inc value, set prebuilt->sql_stat_start = TRUE so that it is performed like any normal SELECT, regardless of the context in which it was invoked. Bug #35352 If InnoDB crashes with UNDO slots full error the error persists on restart We've added a heuristic that checks the size of the UNDO slots cache lists (insert and upate). If either of cached lists has more than 500 entries then we add any UNDO slots that are freed, to the common free list instead of the cache list, this is to avoid the case where all the free slots end up in only one of the lists on startup after a crash. Tested with test case for 26590 and passes all mysql-test(s). Bug #36600 SHOW STATUS takes a lot of CPU in buf_get_latched_pages_number Fixed by removing the Innodb_buffer_pool_pages_latched variable from SHOW STATUS output in non-UNIV_DEBUG compilation.	18 years ago
Georgi Kodinov	a3cd2e2dab	merged 34159 and 37662 5.0-bugteam->5.1-bugteam	18 years ago
Georgi Kodinov	b19155258e	Bug#34159: mysql_install_db fails with sql_mode=TRADITIONAL Reset session sql_mode before creating system tables as it is done in the mysql_fix_privilege_tables.sql script. scripts/mysql_system_tables.sql: reset sql mode	18 years ago
Georgi Kodinov	ae4a35fd5c	Bug#37662 nested if() inside sum() is parsed in exponential time min() and max() functions are implemented in MySQL as macros. This means that max(a,b) is expanded to: ((a) > (b) ? (a) : (b)) Note how 'a' is quoted two times. Now imagine 'a' is a recursive function call that's several 10s of levels deep. And the recursive function does max() with a function arg as well to dive into recursion. This means that simple function call can take most of the clock time. Identified and fixed several such calls to max()/min() : including the IF() sql function implementation. mysql-test/r/func_if.result: Bug#37662 test case mysql-test/t/func_if.test: Bug#37662 test case sql/item.cc: Bug#37662 don't call expensive functions as arguments to min/max sql/item_cmpfunc.cc: Bug#37662 don't call expensive functions as arguments to min/max sql/item_func.cc: Bug#37662 don't call expensive functions as arguments to min/max	18 years ago
Sven Sandberg	5101f124e8	merge 5.1 main -> 5.1-rpl-testfixes all changes automerged without conflicts	18 years ago
Sven Sandberg	c6bf7ead8f	BUG#38068: binlog_stm_binlog fails sporadically in pushbuild Post-push fix: updated some result files that were affected by the previous fix to this bug. mysql-test/suite/binlog/r/binlog_killed_simulate.result: Updated result file. mysql-test/suite/binlog/r/binlog_row_binlog.result: Updated result file. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Updated result file. mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result: Updated result file. mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Updated result file. mysql-test/suite/rpl/r/rpl_stm_log.result: Updated result file.	18 years ago
Kristofer Pettersson	0a415f62fd	Bug#29738 Error message not properly translated to Serbian Community contribution fix for Serbian translation in error message list.	18 years ago
Kristofer Pettersson	f0dfb82fcb	Bug#37781 mysql_drop_user calls get_current_user() twice for no reason Fixed typo and removed duplicate call to get_current_user.	18 years ago
Kristofer Pettersson	0b918cfd7d	auto merge	18 years ago
Alexander Barkov	686ced5367	Bug#35808 utf8 hungarian collation not part of the utf8 charset? config/ac-macros/character_sets.m4 didn't mention hungarian collations in the UTF8 and UCS2 lists.	18 years ago
Igor Babaev	7f615b2c14	Merge	18 years ago
Igor Babaev	b6e3a9e28c	Fixed bug #38191 . Calling List<Cached_item>::delete_elements for the same list twice caused a crash of the server in the function JOIN::cleaunup. Ensured that delete_elements() in JOIN::cleanup would be called only once. mysql-test/r/subselect.result: Added a test case for bug #38191. mysql-test/t/subselect.test: Added a test case for bug #38191. sql/sql_select.cc: Fixed bug #38191. Ensured that delete_elements() in JOIN::cleanup would be called only once.	18 years ago
Patrick Crews	e195149b43	Bug#38383 - Certain funcs_1 trig tests are failing on Pushbuild. Removing duplicate 'setup' portions of these include files. Likely an editor error created dupe lines. This is causing many Pushbuild errors	18 years ago
Georgi Kodinov	c7fc78c3b2	merge of 5.1-main to 5.1-bugteam	18 years ago

1 2 3 4 5 ...

54599 Commits (10ae3ae1c8f7fe3a91caf4e1eeeefe34a9343b54) All Branches Search

54599 Commits (10ae3ae1c8f7fe3a91caf4e1eeeefe34a9343b54)

All Branches