mariadb

Tree: 2a4c97fc3e

Author	SHA1	Message	Date
unknown	2a4c97fc3e	MySQL 5.1.38 merge into MariaDB. Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing from the original merge).	16 years ago
unknown	85c97f96c0	More after-merge fixes for MySQL 5.1.38 merge. Fix version number (we are based on 5.1.38, not 5.1.39). Fix mistaken translation in error message.	16 years ago
Sergey Petrunya	7fd102468c	mysql-test/include/concurrent.inc:	16 years ago
Sergey Petrunya	9f6c4ad8a8	Post-merge fixes	16 years ago
Sergey Petrunya	151e5d586c	Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge	16 years ago
unknown	9ec5b6f444	MySQL 5.1.38 after-merge fixes. Fix some mistakes in the original merge found during review. mysql-test/include/concurrent.inc: Add missing lines mistakenly omitted in merge. mysql-test/include/mix1.inc: Revert wrong change done during merge. mysql-test/include/wait_for_status_var.inc.moved: Remove file which was accidentally not removed during conflict resolution in merge. mysql-test/r/innodb_mysql.result: Revert result file change following fixing root problem in merge.	16 years ago
Sergey Petrunya	2083b7ddfd	Make MariaDB work on windows: - fix xtradb compile failures on windows (why do we have to do it again?)	16 years ago
Sergey Petrunya	75681669e4	Remove percona's mysql-test/patches from MariaDB (we want to get a visible conflict every time they make a change)	16 years ago
Sergey Petrunya	362009fe79	MySQL 5.1 -> MariaDB 5.1 merge: windows build fixes	16 years ago
unknown	1ae43d6ec8	Don't test innodb-use-sys-malloc under Valgrind. InnoDB does not bother to free explicitly one-time allocations at exit, so we get lots of "still reachable" warnings in Valgrind with innodb-use-sys-malloc enabled.	16 years ago
unknown	829c6099b7	After-merge fix for MySQL 5.1.38 merge into MariaDB. Due to a bugfix for enum options in MariaDB, my_getopt parses enums into an ulong. However, some new code from MySQL was written to assume enums take an uint. Fix by using the correct type. (The new MySQL code in addition had an implicit assumption that my_bool and uint were compatible; remove this assumption).	16 years ago
unknown	66a1902a01	After-merge fixes for merge of MySQL-5.1.38. mysql-test/r/innodb.result: Fix wrong merge of result file conflicts. mysql-test/t/bug46080-master.opt: Fix memory limit to take into account extra storage engines in MariaDB. mysql-test/t/innodb.test: Add comment clarifying tricky --replace_result. sql/sql_select.cc: Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge. support-files/build-tags: Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge.	16 years ago
Sergey Petrunya	30ce64cbee	Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and from the default build. We have xtradb instead.	16 years ago
Sergey Petrunya	64fa6d9b94	Fix windows build: add strmov_overlapp.c to CMakeLists.txt	16 years ago
Sergey Petrunya	fcc5589952	Merge MySQL 5.1 -> MariaDB - Don't follow mainline on use of UNINIT_VAR yet, we haven't merged it in.	16 years ago
Sergey Petrunya	8282ed39f2	MySQL 5.1 -> MariaDB 5.1 merge - Post-merge fixes	16 years ago
Igor Babaev	b495b3db23	Added a missing dependency to build maria lib	16 years ago
Sergey Petrunya	e2d6412d42	Post-merge fix	16 years ago
Sergey Petrunya	241c1977dd	Merge xtradb-7 -> MariaDB	16 years ago
Sergey Petrunya	29f0dcb563	Merge MySQL->MariaDB * Finished Monty and Jani's merge * Some InnoDB tests still fail (because it's old xtradb code run against newer testsuite). They are expected to go after mergning with the latest xtradb.	16 years ago
unknown	d50e99c9f6	Fix that thd->query_plan_flags was not initialised prior to executing non-query commands (also fixes a Valgrind warning in Buildbot).	16 years ago
unknown	be70bfe043	Fix compiler warnings.	16 years ago
Sergey Petrunya	2fa8315c08	Fix ha_maria to compile on Windows	16 years ago
unknown	fb820d2c8b	Merge. - PBXT fixes. - MBug#423035 fix. - Compiler warning fixes.	16 years ago
unknown	554748cce4	PBXT fixes. - Silence a compiler warning. - Don't build pbms object files now that we disabled pbms. storage/pbxt/src/Makefile.am: We disabled PBMS, so don't build it. storage/pbxt/src/datalog_xt.cc: Silence a warning about signed/unsigned comparison.	16 years ago
Michael Widenius	f417c043df	Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL Added (rewritten) patch from Percona to get extended statistics in slow.log: - Added handling of 'set' variables to set_var.cc. Changed sql_mode to use this - Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' - Added optional logging to slow log, through log_slow_verbosity, of query plan statistics - Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter - Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' - Added log-slow-time as synonym for long-query-time Some trivial MyISAM optimizations: - In prepare for drop, flush key blocks - Don't call mi_lock_database if my_disable_locking is used **** Automatic merge with trunc ** Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL Added (rewritten) patch from Percona to get extended statistics in slow.log: - Added handling of 'set' variables to set_var.cc. Changed sql_mode to use this - Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' - Added optional logging to slow log, through log_slow_verbosity, of query plan statistics - Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter - Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' - Added log-slow-time as synonym for long-query-time Some trivial MyISAM optimizations: - In prepare for drop, flush key blocks - Don't call mi_lock_database if my_disable_locking is used KNOWN_BUGS.txt: Updated file to reflect MariaDB and not the Maria storage engine ** Updated file to reflect MariaDB and not the Maria storage engine README: Updated file to reflect MariaDB ** Updated file to reflect MariaDB mysql-test/r/log_slow.result: Test new options for slow query log ** Test new options for slow query log mysql-test/r/variables.result: Updated result (old version cut of things at 79 characters) ** Updated result (old version cut of things at 79 characters) mysql-test/t/log_slow.test: Test new options for slow query log ** Test new options for slow query log sql/Makefile.am: Added log_slow.h ** Added log_slow.h sql/event_data_objects.cc: Removed not needed test for enable_slow_log (is done when the flag is tested elsewhere) ** Removed not needed test for enable_slow_log (is done when the flag is tested elsewhere) sql/events.cc: Use the general make_set() function instead of 'symbolic_mode_representation' ** Use the general make_set() function instead of 'symbolic_mode_representation' sql/filesort.cc: Added status for used query plans ** Added status for used query plans sql/log.cc: Reset counters if no query_length (from Percona's patch; Not sure if needed, but can do no harm) Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' Added optional logging to slow log, through log_slow_verbosity, of query plan statistics Fixed wrong test of error condition ** Reset counters if no query_length (from Percona's patch; Not sure if needed, but can do no harm) Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' Added optional logging to slow log, through log_slow_verbosity, of query plan statistics Fixed wrong test of error condition sql/log_slow.h: Defines and variables for log_slow_verbosity and log_slow_filter ** Defines and variables for log_slow_verbosity and log_slow_filter sql/mysql_priv.h: Include log_slow.h ** Include log_slow.h sql/mysqld.cc: Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' Added log-slow-time as synonym for long-query-time Added note that one should use log-slow-filter instead of log-slow-admin-statements Updated comment from 'slow_query_log_file' ** Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' Added log-slow-time as synonym for long-query-time Added note that one should use log-slow-filter instead of log-slow-admin-statements Updated comment from 'slow_query_log_file' sql/set_var.cc: Added long_slow_time as synonym for long_query_time Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter dded handling of 'set' variables to set_var.cc. Changed sql_mode to use this ** Added long_slow_time as synonym for long_query_time Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter dded handling of 'set' variables to set_var.cc. Changed sql_mode to use this sql/set_var.h: - Added handling of 'set' variables. Changed sql_mode to use this ** - Added handling of 'set' variables. Changed sql_mode to use this sql/slave.cc: Use global filter also for slaves ** Use global filter also for slaves sql/sp_head.cc: Simplify saving of general_slow_log state Use the general make_set() function instead of 'symbolic_mode_representation' ** Simplify saving of general_slow_log state Use the general make_set() function instead of 'symbolic_mode_representation' sql/sql_cache.cc: Added status for used query plans ** Added status for used query plans sql/sql_class.cc: Remember/restore query_plan_flags over complex statements ** Remember/restore query_plan_flags over complex statements sql/sql_class.h: Added variables to handle extended slow log statistics ** Added variables to handle extended slow log statistics sql/sql_parse.cc: Added status for used query plans Added test for filtering slow_query_log ** Added status for used query plans Added test for filtering slow_query_log sql/sql_select.cc: Added status for used query plans ** Added status for used query plans sql/sql_show.cc: Use the general make_set() function instead of 'symbolic_mode_representation' ** Use the general make_set() function instead of 'symbolic_mode_representation' sql/strfunc.cc: Report first error (not last) if something is wrong in a set Removed compiler warning ** Report first error (not last) if something is wrong in a set Removed compiler warning storage/myisam/mi_extra.c: In prepare for drop, flush key blocks (speed optimization) ** In prepare for drop, flush key blocks (speed optimization) storage/myisam/mi_locking.c: Don't call mi_lock_database if my_disable_locking is used (speed optimization) **** Don't call mi_lock_database if my_disable_locking is used (speed optimization)	16 years ago
Michael Widenius	cd3047fc89	Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL Added (rewritten) patch from Percona to get extended statistics in slow.log: - Added handling of 'set' variables to set_var.cc. Changed sql_mode to use this - Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' - Added optional logging to slow log, through log_slow_verbosity, of query plan statistics - Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter - Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' - Added log-slow-time as synonym for long-query-time Some trivial MyISAM optimizations: - In prepare for drop, flush key blocks - Don't call mi_lock_database if my_disable_locking is used KNOWN_BUGS.txt: Updated file to reflect MariaDB and not the Maria storage engine README: Updated file to reflect MariaDB mysql-test/r/log_slow.result: Test new options for slow query log mysql-test/r/variables.result: Updated result (old version cut of things at 79 characters) mysql-test/t/log_slow.test: Test new options for slow query log sql/Makefile.am: Added log_slow.h sql/event_data_objects.cc: Removed not needed test for enable_slow_log (is done when the flag is tested elsewhere) sql/events.cc: Use the general make_set() function instead of 'symbolic_mode_representation' sql/filesort.cc: Added status for used query plans sql/log.cc: Reset counters if no query_length (from Percona's patch; Not sure if needed, but can do no harm) Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' Added optional logging to slow log, through log_slow_verbosity, of query plan statistics Fixed wrong test of error condition sql/log_slow.h: Defines and variables for log_slow_verbosity and log_slow_filter sql/mysql_priv.h: Include log_slow.h sql/mysqld.cc: Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' Added log-slow-time as synonym for long-query-time Added note that one should use log-slow-filter instead of log-slow-admin-statements Updated comment from 'slow_query_log_file' sql/set_var.cc: Added long_slow_time as synonym for long_query_time Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter dded handling of 'set' variables to set_var.cc. Changed sql_mode to use this sql/set_var.h: - Added handling of 'set' variables. Changed sql_mode to use this sql/slave.cc: Use global filter also for slaves sql/sp_head.cc: Simplify saving of general_slow_log state Use the general make_set() function instead of 'symbolic_mode_representation' sql/sql_cache.cc: Added status for used query plans sql/sql_class.cc: Remember/restore query_plan_flags over complex statements sql/sql_class.h: Added variables to handle extended slow log statistics sql/sql_parse.cc: Added status for used query plans Added test for filtering slow_query_log sql/sql_select.cc: Added status for used query plans sql/sql_show.cc: Use the general make_set() function instead of 'symbolic_mode_representation' sql/strfunc.cc: Report first error (not last) if something is wrong in a set Removed compiler warning storage/myisam/mi_extra.c: In prepare for drop, flush key blocks (speed optimization) storage/myisam/mi_locking.c: Don't call mi_lock_database if my_disable_locking is used (speed optimization)	16 years ago
unknown	592379fc95	Fix most Compiler warnings seen in buildbot. Add suppressions for a few warnings that cannot be meaningfully fixed by MariaDB developers. Changes for XtraDB, PBXT, and YaSSL also submitted upstream. Also add a `ccfilter` wrapper that can be used to filter out suppressed warnings in a local build (to check that new warnings are not introduced). client/mysqlbinlog.cc: Fix compiler warnings. config/ac-macros/misc.m4: Fix wrong naming, autoconfig requires _cv_ in cached names. extra/yassl/include/yassl_int.hpp: Fix compiler warnings. extra/yassl/src/handshake.cpp: Fix compiler warnings. extra/yassl/src/yassl_imp.cpp: Fix compiler warnings. extra/yassl/src/yassl_int.cpp: Fix compiler warnings. extra/yassl/taocrypt/include/modes.hpp: Fix compiler warnings. extra/yassl/taocrypt/src/asn.cpp: Fix compiler warnings. mysys/my_compress.c: Fix compiler warnings. sql/mysqld.cc: Fix compiler warnings. sql/strfunc.cc: Fix compiler warnings. storage/pbxt/src/discover_xt.cc: Fix compiler warnings. storage/xtradb/fil/fil0fil.c: Fix compiler warnings. storage/xtradb/mtr/mtr0mtr.c: Fix compiler warnings. storage/xtradb/srv/srv0srv.c: Fix compiler warnings. storage/xtradb/srv/srv0start.c: Fix compiler warnings. strings/decimal.c: Fix compiler warnings. support-files/ccfilter: Add helper for suppressing compiler warnings in local developer source tree. Allows to check for not introducing new warnings into Buildbot without having to actually run the build through Buildbot. support-files/compiler_warnings.supp: Suppress a few warnings that cannot be meaningfully fixed in source code.	16 years ago
unknown	03db11cfda	MBug#423035: error in parsing enum value for plugin variable in mysqld command-line option Fix parsing of invalid plugin enum option value. Previous patch to fix plugin enum option parsing on big-endian introduced another bug due to incorrect comparison of unsigned value. This would cause an incorrect value to be parsed as value 0. See also MySQL Bug#41010 and Bug#32034. mysql-test/mysql-test-run.pl: Add a facility for test case to run the mysqld binary (to test that invalid startup options are rejected correctly). mysql-test/r/mysqld_option_err.result: Add a test case to check that invalid startup options for mysqld are rejected. This is needed to test MBug#423035. Also add a few other similar tests, as this was completely untested before this patch. mysql-test/t/mysqld_option_err.test: Add a test case to check that invalid startup options for mysqld are rejected. This is needed to test MBug#423035. Also add a few other similar tests, as this was completely untested before this patch. mysys/my_getopt.c: Fix parsing of invalid plugin enum option value.	16 years ago
Paul McCullagh	f58512d8b7	Fixed a bug that caused MySQL to crash on shutdown, if startup fails due to an incorrect command line parameter	16 years ago
Sergey Petrunya	e438618f1b	MWL#17: Table elimination Pre-push merge to main. This should give the complete WL entry diff.	16 years ago
Sergey Petrunya	4779af2921	More comments	16 years ago
Sergey Petrunya	2656709a45	Merge	16 years ago
Sergey Petrunya	34d901c08e	Merge	16 years ago
Sergey Petrunya	24c2fea6ad	MWL#17: Table elimination - Address review feedback R4: better comments, formatting	16 years ago
Sergey Petrunya	d841ea23ef	Trivial fixes for windows compile failures - Add strmov_overlapp.c where it's needed - Add libevent where it is required - Fix typo in unittest/mysys/waiting_threads-t.c - fix xtradb C language source so that they have variable declarations before any operators, as it is (or was?) required in C. libmysql/CMakeLists.txt: - Add strmov_overlapp.c where it's needed sql/CMakeLists.txt: - Add strmov_overlapp.c where it's needed - Add libevent where it is required storage/xtradb/btr/btr0cur.c: - fix xtradb C language source so that they have variable declarations before any operators, as it is (or was?) required in C. storage/xtradb/buf/buf0buddy.c: - fix xtradb C language source so that they have variable declarations before any operators, as it is (or was?) required in C. storage/xtradb/buf/buf0flu.c: - fix xtradb C language source so that they have variable declarations before any operators, as it is (or was?) required in C. storage/xtradb/fil/fil0fil.c: - fix xtradb C language source so that they have variable declarations before any operators, as it is (or was?) required in C. storage/xtradb/handler/i_s.cc: - fix xtradb C language source so that they have variable declarations before any operators, as it is (or was?) required in C. storage/xtradb/srv/srv0srv.c: - fix xtradb C language source so that they have variable declarations before any operators, as it is (or was?) required in C. strings/CMakeLists.txt: - Add strmov_overlapp.c where it's needed unittest/mysys/waiting_threads-t.c: - Fix typo in unittest/mysys/waiting_threads-t.c	16 years ago
Jonathan Perkin	71f4bfd6c7	Only install the innodb plugin if the plugin directory exists.	16 years ago
Sergey Petrunya	d762bf21cc	MWL#17: Table-elimination - Addressing review feedback, generation 4. include/my_global.h: Make ALIGN_PTR's action correspond to that of ALIGN_SIZE sql/item.cc: MWL#17: Table-elimination - Review feedback: function renames, better comments sql/item.h: MWL#17: Table-elimination - Review feedback: function renames, better comments sql/item_cmpfunc.cc: MWL#17: Table-elimination - Review feedback: function renames, better comments sql/item_subselect.cc: MWL#17: Table-elimination - Review feedback: function renames, better comments sql/item_subselect.h: MWL#17: Table-elimination - Review feedback: function renames, better comments sql/opt_table_elimination.cc: MWL#17: Table-elimination - Addressing review feedback, generation 4: abstract everything in case we would need to change it for something else in the future. sql/sql_list.h: MWL#17: Table-elimination - Introduce exchange_sort(List<T> ...) template function sql/sql_select.cc: MWL#17: Table-elimination - Review feedback: function renames, better comments	16 years ago
unknown	177f024954	Merge Paul's maria-pbxt-rc2 branch into MariaDB. Includes disabling PBMS (per Paul's recommendation) and test file fixes. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>	16 years ago
unknown	12ca48990e	PBXT merge fixes. - Disable PBMS in MariaDB (as per recommendation of Paul). - Add missing *-master.opt files to make testsuite work on case-sensitive file systems. - Result file updates.	16 years ago
unknown	51da40e45e	Add missign header file to `make dist`.	16 years ago
unknown	6cc803f035	Fix `make dist` after solaris build file fixes. Solaris build scripts under BUILD/ were changed, but Makefile.am was not updated to reflect the new set of file names.	16 years ago
Sergey Petrunya	005c24e973	MWL#17: Table elimination: - Fix a trivial problem when OR-merging two multi-equalities - Amend testsuite to provide full gcov coverage mysql-test/r/table_elim.result: MWL#17: Table elimination: - Amend testsuite to provide full gcov coverage mysql-test/t/table_elim.test: MWL#17: Table elimination: - Amend testsuite to provide full gcov coverage	16 years ago
Sergey Petrunya	c483437781	Gcov support improvements - add process-gcov-annotations.pl script that processes .gcov files according to purecov annotations in source code - add --gcov-src-dir=subdir option to mysql-test-run so that one can do gcov processing only for source files in a certain directory.	16 years ago
Sergey Petrunya	0e7a18e4a8	MWL#17: Table elimination - Mark gcov deadcode	16 years ago
Jonathan Perkin	74092a8e5b	Disable ftexample to match other packages, ride previous changelog entry.	16 years ago
Sergey Petrunya	de41681afa	MWL#17: Table elimination - More test coverage - Remove unused code	16 years ago
Sergey Petrunya	9400700b99	MWL#17: Table elimination - Add more testcases. - Fix trivial compile failure - Remove handling of "column IN (one_element)". This is converted to equality elsewhere mysql-test/r/table_elim.result: MWL#17: Table elimination - Add more testcases. - Fix trivial compile failure mysql-test/t/table_elim.test: MWL#17: Table elimination - Add more testcases sql/mysqld.cc: MWL#17: Table elimination - Fix trivial compile failure sql/opt_table_elimination.cc: MWL#17: Table elimination - Add more testcases. - Remove handling of "column IN (one_element)".This is converted to equality elsewhere	16 years ago
Sergey Petrunya	d294aae6c8	MWL#17: Table elimination: last fixes - Add an @@optimizer_switch flag for table_elimination for debug build - Better comments mysql-test/t/index_merge_myisam.test: MWL#17: Table elimination: last fixes - Add an @@optimizer_switch flag for table_elimination for debug build sql/mysql_priv.h: MWL#17: Table elimination: last fixes - Add an @@optimizer_switch flag for table_elimination for debug build sql/mysqld.cc: MWL#17: Table elimination: last fixes - Add an @@optimizer_switch flag for table_elimination for debug build	16 years ago
Jonathan Perkin	c2bd07ca9c	Tidy previous, put example storage engine back as it's used by tests.	16 years ago

1 2 3 4 5 ...

59203 Commits (2a4c97fc3eb90c49f81219183dd6d9b998df3077) All Branches Search

59203 Commits (2a4c97fc3eb90c49f81219183dd6d9b998df3077)

All Branches