delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	10.0-base merge	Sergei Golubchik	2013-04-15	976	-26743/+38085
\|\
\| *	5.5 merge	Sergei Golubchik	2013-04-14	56	-177/+767
\| \|\
\| \| *	add missing tests	Sergei Golubchik	2013-04-14	4	-0/+86
\| \| \|
\| \| *	Increase default value of max_binlog_cache_size and ↵	Michael Widenius	2013-04-12	3	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	max_binlog_stmt_cache_size to ulonglong_max. This fixes that by default LOAD DATA INFILE will not generate the error: "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage..." mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result: Updated test case mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result: Updated test case sql/sys_vars.cc: Increase default value of max_binlog_cache_size and max_binlog_stmt_cache_size to ulonglong_max.
\| \| *	complier warnings. hide the redundant condition under #ifdef	Sergei Golubchik	2013-04-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	(because only there it makes any sense)
\| \| *	5.3 merge	Sergei Golubchik	2013-04-12	15	-108/+205
\| \| \|\
\| \| \| *	5.2 merge	Sergei Golubchik	2013-04-11	8	-88/+156
\| \| \| \|\
\| \| \| \| *	5.1 merge	Sergei Golubchik	2013-04-11	8	-81/+149
\| \| \| \| \|\
\| \| \| \| \| *	MDEV-4244 [PATCH] Buffer overruns and use-after-free errors	Sergei Golubchik	2013-04-06	5	-72/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes for gcc 4.8 - compilation warnings and -fsanitize=address
\| \| \| \| \| *	MDEV-4088 Replication 10.0 -> 5.5 fails	Sergei Golubchik	2013-04-04	3	-9/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update 5.1 to replicate from 10.0 and to show the server version (as of 10.0) correctly sql-common/client.c: mdev:4088 sql/slave.cc: use the version number, not just the first character of the version string (we want 10 > 4 not "10" < "4").
\| \| \| * \| \|	MDEV-4244 [PATCH] Buffer overruns and use-after-free errors	Sergei Golubchik	2013-04-06	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes for gcc 4.8 -fsanitize=address
\| \| \| * \| \|	MDEV-4316 MariaDB server crash with signal 11	Sergei Golubchik	2013-04-06	5	-15/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fulltext search was initialized for all MATCH ... AGAINST items at the end of the JOIN::optimize(). But since 5.3 derived tables are initialized lazily on first use, very late in the sub_select(). Skip Item_func_match::init_search initialization if the corresponding table isn't open yet; repeat fulltext initialization for all not-yet-initialized MATCH ... AGAINST items after creating derived tables.
\| \| \| * \| \|	If a range tree has a branch that is an expensive constant,	unknown	2013-04-08	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	currently get_mm_tree skipped the evaluation of this constant and icorrectly proceeded. The correct behavior is to return a NULL subtree, according to the IF branch being fixed - when it evaluates the constant it returns a value, and doesn't continue further.
\| \| \| * \| \|	Update tests results, mysql-test/r/windows.result	Sergey Petrunya	2013-04-04	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	MDEV-4356 : MariaDB does not start if bind-address gets resolved to more ↵	Vladislav Vaintroub	2013-04-07	1	-23/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	than single IP address. MySQL bug http://bugs.mysql.com/bug.php?id=61713 was fixed in 5.5 Fix is to remove check for multiple entries returned by getaddrinfo(), and use the first entry that works - i.e socket can be created. Unlike Oracle/MySQL's fix ,this one is kept minimal : - we do not prioritize IPv4 over IPv6, orr other way around, and just rely on operating system to sort getaddrinfo() entries in sensible order. There is RFC that defines what is sensible order for getaddrinfo entries ( RFC 3484), and OS specific tweaks are also possible , like /etc/gai.conf o Linux. - also, we do not force "0.0.0.0" address if bind-address is not given - this would be a change in behavior of 5.5 at least on Windows, where passing NULL as to getaddrinfo() gives back IPv6-wildcard.
\| \| * \| \| \|	MDEV-4338 - Support FusionIO/directFS atomic writes	Vladislav Vaintroub	2013-04-06	5	-0/+153
\| \| \| \| \| \|
\| \| * \| \| \|	MDEV-4338 - Support FusionIO/directFS atomic writes	Vladislav Vaintroub	2013-04-06	5	-0/+153
\| \| \| \| \| \|
\| \| * \| \| \|	compilation warnings	Sergei Golubchik	2013-04-04	1	-6/+6
\| \| \| \| \| \|
\| \| * \| \| \|	fix have_debug_sync.inc to be more robust	Sergei Golubchik	2013-04-04	2	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(debug_sync value can have single quotes)
\| \| * \| \| \|	MDEV-4161 Assertion `status_var.memory_used == 0' fails in virtual THD::~THD()	Sergei Golubchik	2013-04-04	4	-1/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	init join->top_join_tab_count to be in sync with join->join_tab=stat, otherwise a query can be killed in-between and join_tab's won't be deleted (JOIN::cleanup won't call JOIN_TAB::cleanup)
\| \| * \| \| \|	MDEV-4243 Warnings/errors while compiling with clang	Sergei Golubchik	2013-03-28	13	-24/+19
\| \| \| \| \| \|
\| \| * \| \| \|	Merge 5.3 -> 5.5	Sergey Petrunya	2013-04-03	6	-10/+46
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	MDEV-4240: mariadb 5.3.12 using more memory than MySQL 5.1 for an ↵	Sergey Petrunya	2013-04-01	2	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	inefficient query - Let index_merge allocate table handlers on quick select's MEM_ROOT, not on statement's MEM_ROOT. This is crucial for big "range checked for each record" queries, where index_merge can be created and deleted many times during query exection. We should not make O(#rows) allocations on statement's MEM_ROOT.
\| \| \| * \| \|	MDEV-4335: Unexpected results when selecting on information_schema	Sergey Petrunya	2013-03-29	4	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- When converting a subquery to a semi-join, propagate OPTION_SCHEMA_TABLE.
\| * \| \| \| \|	Merge	Sergey Petrunya	2013-04-13	1	-0/+1
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Temporarily disable show_explain.test	Sergey Petrunya	2013-04-13	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).	Alexey Botchkov	2013-04-13	19	-88/+523
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Syntax modified to allow statements: ALTER TABLE ADD/DROP COLUMN ALTER TABLE ADD/DROP INDEX ALTER TABLE ADD/DROP FOREIGN KEY ALTER TABLE ADD/DROP PARTITION ALTER TABLE CHANGE COLUMN ALTER TABLE MODIFY COLUMN DROP INDEX to have IF (NOT) EXISTS options. Appropriate implementations added to mysql_alter_table(). per-file comments: mysql-test/r/alter_table.result MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). test result updated. mysql-test/r/fulltext.result MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). mysql-test/r/partition.result test result updated. MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). mysql-test/t/alter_table.test tests added. MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). mysql-test/t/fulltext.test MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). tests added. mysql-test/t/partition.test MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). tests added. sql/field.cc MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). create_if_not_exists field added. sql/field.h MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). create_if_not_exists field added. sql/partition_info.h MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). has_unique_name made public. sql/sp_head.cc MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). sql/sql_class.cc MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). create_if_not_exists inited. sql/sql_class.h MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). create_if_not_exists inited. sql/sql_lex.cc MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). check_exists inited. sql/sql_lex.h MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). check_exists inited. sql/sql_parse.cc MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). check_exists inited. sql/sql_table.cc MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). handle_if_exists_options() added. it's called in mysql_alter_table(). sql/sql_trigger.cc MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). check_exists instead of drop_if_exists. sql/sql_view.cc MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). check_exists instead of drop_if_exists. sql/sql_yacc.yy MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). sintax modified.
\| * \| \| \| \| \|	MDEV-3917 multiple use locks (GET_LOCK) in one connection.	Alexey Botchkov	2013-04-12	14	-348/+864
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The patch contributed by Konstantin Osipov applied. Native comments: Implement multiple user-level locks per connection. GET_LOCK() function in MySQL allows a connection to hold at most one user level lock. Taking a new lock automatically releases the old lock, if any. The limit of one lock per session existed since early versions of MySQL didn't have a deadlock detector for SQL locks. MDL patches in MySQL 5.5 added a deadlock detector, so starting from 5.5 it became possible to take multiple locks in any order -- a deadlock, should it occur, would be detected and an error returned to the client which closed the wait chain. This is exactly what is done in this patch: ULLs are moved to use MDL subsystem.
\| * \| \| \| \| \|	portability fixes for mysql-test	Sergei Golubchik	2013-04-10	6	-18/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/mysqld--help.result: that's default to number of CPUs mysql-test/suite/archive/discover.test: move_file uses rename(2), which may end up with "Invalid cross-device link" mysql-test/suite/archive/partition_archive.test: on Solaris the error message is different
\| * \| \| \| \| \|	Linking problem on Windows	Sergei Golubchik	2013-04-10	2	-8/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	MDEV-4254 Semisync plugins to link statically into MariaDB	Sergei Golubchik	2013-04-09	31	-250/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix semisync plugins and tests to work with both with static and dynamic linking
\| * \| \| \| \| \|	MDEV-4088 Replication 10.0 -> 5.5 fails	Sergei Golubchik	2013-04-09	3	-1/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove old workaround for replicating from old	Sergei Golubchik	2013-04-09	5	-137/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MySQL 5.1 and 5.2 alpha trees.
\| * \| \| \| \| \|	prefer static inline functions to macros.	Sergei Golubchik	2013-04-09	4	-39/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	avoid unnecessary strlen()'s
\| * \| \| \| \| \|	put status variables in the proper pluginname_ scope	Sergei Golubchik	2013-04-09	12	-118/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(but support the scopeless mysql style too). always output status/system variables in the correct lettercase
\| * \| \| \| \| \|	MDEV-3807 show plugins soname 'xxx'	Sergei Golubchik	2013-04-09	17	-24/+402
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and INFORMATION_SCHEMA.ALL_PLUGINS table with condition pushdown for I_S.ALL_PLUGINS and a new status variable to cound successful dlopen's
\| * \| \| \| \| \|	MDEV-4022 table attributes with sysvar as a default value	Sergei Golubchik	2013-04-09	11	-46/+265
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	create sys_var::val_str(), sys_var::val_int(), sys_var::val_real().	Sergei Golubchik	2013-04-09	6	-196/+127
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change Item_func_get_system_var::val_xxx functions to use that. mysql-test/t/variables.test: @@GLOBAL.INIT_CONNECT is never NULL anymore. Nor it ever was. It was a bug that empty string system variables appeared as NULL in the integer context (but not in a string, real, or decimal context!)
\| * \| \| \| \| \|	cleanup	Sergei Golubchik	2013-04-09	3	-36/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	error messages: name the storage engine explicitly,	Sergei Golubchik	2013-04-09	50	-475/+395
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of "used storage engine" and similar changes.
\| * \| \| \| \| \|	post-review comments and other minor edits	Sergei Golubchik	2013-04-09	10	-68/+75
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add sequence and sql_discovery suites to the default list.	Sergei Golubchik	2013-04-09	1	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	implement ./mtr --dry-run
\| * \| \| \| \| \|	optimize discovery for cases when the storage engine is known in advance	Sergei Golubchik	2013-04-09	7	-17/+30
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	mysql-test fixes	Sergei Golubchik	2013-04-09	7	-20/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	assisted discovery in federatedx	Sergei Golubchik	2013-04-09	5	-18/+162
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Assisted discovery	Sergei Golubchik	2013-04-09	3	-14/+81
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix internal plugin names	Sergei Golubchik	2013-04-09	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	dead code, remove unused argument	Sergei Golubchik	2013-04-09	6	-19/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove HA_CREATE_INFO::frm_only - it's internal server flag,	Sergei Golubchik	2013-04-09	4	-22/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not part of the SE API, and, again, mutually exclusive with C_ORDINARY_CREATE and C_CREATE_SELECT.
\| * \| \| \| \| \|	small cleanup	Sergei Golubchik	2013-04-09	1	-23/+15
\| \| \| \| \| \| \|