Kristian Nielsen
0e717c5bf4
Merge branch 'mdev-6981-master_gtid_wait-status-variables' of https://github.com/openquery/mariadb-server into danblack
...
Conflicts:
sql/mysqld.cc
2015-03-16 13:41:11 +01:00
Sergey Vojtovich
18e9c314e4
MDEV-6650 - LINT_INIT emits code in non-debug builds
...
Replaced all references to LINT_INIT with UNINIT_VAR and LINT_INIT_STRUCT.
Removed LINT_INIT macro.
2015-03-16 14:48:22 +04:00
Alexey Botchkov
10554ca6cb
Test results fixed.
2015-03-16 12:02:21 +04:00
Alexander Barkov
f48dc5ccc7
Moving the conversion code from String::well_formed_copy()
...
to my_convert_fix() - a new function in /strings.
2015-03-16 12:14:31 +04:00
Jan Lindström
c4b268add0
InnoDB cleanup. Remove empty statements i.e. extra ; characters.
2015-03-16 09:14:13 +02:00
Alexey Botchkov
da4b52432a
MDEV-7512 GIS: ST_ synonyms for functions are not consistent.
...
Checked for missing synonims, added those found.
2015-03-15 23:00:05 +04:00
Alexey Botchkov
874f0d7759
Test result fixed.
2015-03-15 22:27:45 +04:00
Alexey Botchkov
37345bd9dd
MDEV-7529 GIS: ST_Relate returns unexpected results for POINT relations.
...
Problem was that we considered the point itself as the 'border' object. Instead
of that the 'border' of a POINT is an empty set, and the point is the 'interior'.
Another error fixed by the way - not all operations of the resulting function were properly
allocated.
2015-03-15 22:20:38 +04:00
Alexey Botchkov
ca30418837
MDEV-7514 GIS: PointOnSurface returns NULL instead of the point.
...
Need to take into account cases of a polygon shaped as a very thin line.
2015-03-15 11:17:50 +04:00
Oleksandr Byelkin
a21ef88d2a
MDEV-6954: SET STATEMENT rand_seedX = ...FOR ... makes the next rand() to return 0
...
The variables now return real values. They can't be made usual variables because they do not have DEFAULT value.
2015-03-14 08:41:43 +01:00
Oleksandr Byelkin
41106b229e
MDEV-6997: SET STATEMENT last_insert_id FOR ... does not affect the value written to the binlog
...
Problem was in reinitialization of first_successful_insert_id_in_prev_stmt_for_binlog after setting variables.
2015-03-13 20:42:30 +01:00
Alexander Barkov
197afb413f
MDEV-6566 Different INSERT behaviour on bad bytes with and without character set conversion
2015-03-13 16:51:36 +04:00
Alexey Botchkov
702fba1511
MDEV-7510 GIS: IsRing returns false for a primitive triangle.
...
The problem is in the IsSimple function. If the first and the last points
of a curve coincide it's and exception and the line is still 'simple'.
2015-03-13 16:10:31 +04:00
Alexander Barkov
75d65b5f4e
MDEV-6989 BINARY and COLLATE xxx_bin comparisions are not used for optimization in some cases
2015-03-13 15:48:39 +04:00
Alexander Barkov
bd2105855a
Adding "const" qualifier to Item::compare_collation()
2015-03-13 13:52:07 +04:00
Jan Lindström
4d0e52189c
MDEV-7770: Online DDL progress output contains incorrectly printed index names
...
Index names were not formatted correctly.
2015-03-13 09:38:08 +02:00
Alexander Barkov
bb3115b256
MDEV-6990 GROUP_MIN_MAX optimization is not applied in some cases when it could
2015-03-12 18:12:15 +04:00
Alexey Botchkov
129c82bb59
MDEV-7334 valgrind warning "unitialized bytes" in 10.1.
...
The 'srid' field's copying was missing in the copying Create_field::Create_field() constructor.
2015-03-12 17:50:23 +04:00
Jan Lindström
8249dcaaeb
MDEV-6858: enforce_storage_engine option
...
Merge from Percona Server enforced use of a specific storage engine
authored by Stewart Smith.
Modified to be session variable and modifiable only by SUPER. Use
similar implementation as default_storage_engine.
2015-03-12 12:17:14 +02:00
Alexander Barkov
ba3573cae8
Clean-up:
...
- Renaming Item::is_bool_func() to is_bool_type(), to avoid assumption
that the item is an Item_func derivant.
- Deriving Item_func_spatial_rel from Item_bool_func rather than Item_int_func
2015-03-12 13:40:52 +04:00
Oleksandr Byelkin
a71e2d23bd
MDEV-7006 MDEV-7007: SET STATEMENT and slow log
...
fixed embedded server tests
MDEV-7009: SET STATEMENT min_examined_row_limit has no effect
MDEV-6948:SET STATEMENT gtid_domain_id = ... FOR has no effect (same for gtid_seq_no and server_id)
old values of SET STATENENT variables now saved in its own Query_arena and restored later
2015-03-12 10:19:32 +01:00
Oleksandr Byelkin
dab12366b1
MDEV-6956:SET STATEMENT default_master_connection = ... has no effect
...
the problem was in assigning default value during parsing.
2015-03-12 09:47:36 +01:00
Alexander Barkov
e91bc2e91d
MDEV-7759 NULLIF(x,y) is not equal to CASE WHEN x=y THEN NULL ELSE x END
2015-03-12 11:40:37 +04:00
Daniel Black
fa5809ce10
Add Master_gtid_wait_{count,time,timeouts} status
...
MASTER_GTID_WAIT function needs some status to evaluate its use.
master_gtid_wait_count indicates how many times the function is called.
master_gtid_wait_time indicates how much time in microseconds occurred
waiting (or timing out)
master_gtid_timeouts indicates how many time times this function timed
out rather than all successful gtids events being available.
2015-03-12 06:43:38 +11:00
Oleksandr Byelkin
80f03abcca
MDEV-7671: Cache VIEW definitions in the TDC
...
(changes of backported patch are very small: strlen removed, error processing fixed, view open statistics added)
2015-03-11 17:39:15 +01:00
Oleksandr Byelkin
3aa1a600bb
Merge branch '10.1' of github.com:MariaDB/server into 10.1
2015-03-11 15:15:43 +01:00
Oleksandr Byelkin
be73c7ee44
MDEV-6951: Erroneous SET STATEMENT produces two identical errors
...
Double error reporting removed.
2015-03-11 14:57:30 +01:00
Alexey Botchkov
52a1b5a8c2
MY_CHECK_AND_SET_COMPILER_FLAG changes
...
* watch for "redefined macro" warning
* don't enable -D_FORTIFY_SOURCE=2 in debug builds (it requires -O)
2015-03-11 13:05:03 +04:00
Alexander Barkov
190858d996
Removing duplicate code: adding Item_func_bool_predicate as a
...
common parent class for Item_func_isnull and Item_func_isnotnull
2015-03-11 12:40:35 +04:00
Jan Lindström
9f4ee16bf3
MDEV-7619: Improve long semaphore wait output
...
Add holder thread_id, file_name and line to output.
2015-03-11 07:31:57 +02:00
Alexey Botchkov
ba43735c68
Check for the openssl-dev so the build doesn't fail without it.
2015-03-10 22:34:57 +04:00
Vicențiu Ciorbaru
0ed57e34c7
MDEV-7025 ANALYZE SELECT/INSERT/UPDATE/DELETE from a view does not check access permissions on the view
...
Added access checking for the ANALYZE statement command.
2015-03-10 14:11:02 +02:00
Jan Lindström
c8035da9b8
Add more information if page state is not correct.
2015-03-10 14:05:57 +02:00
Sergei Golubchik
f7d196bb2e
32bit fix
2015-03-08 17:22:37 +01:00
Sergei Golubchik
e2de804491
Merge branch '10.1' into bb-10.1-serg
2015-03-08 12:54:42 +01:00
Sergei Petrunia
2288b84df4
MDEV-7679: ANALYZE crashes when printing WHERE when no default db
...
Fix Item_ident::print() to work when there is no current database
2015-03-07 20:51:35 +03:00
Sergei Petrunia
66ad265f3b
MDEV-7674: ANALYZE shows r_rows=0
...
Change r_rows to be double
2015-03-07 19:30:19 +03:00
Sergei Golubchik
5bff6c5d57
bison warning: clash on default action: <NONE> != <object_ddl_options>
2015-03-07 15:32:52 +01:00
Sergei Golubchik
6d8b74dd07
add a test for drop trigger under --read-only
2015-03-07 13:28:04 +01:00
Sergei Golubchik
18feb62fee
MDEV-6819 st_mysql_show_var::value should be void* not char*
2015-03-07 13:27:56 +01:00
Sergei Golubchik
20cacb0064
fix a crash of innodb.innodb_mutexes,innodb_plugin
...
add forgotten initialization of the mutex name
2015-03-07 13:27:49 +01:00
Sergei Golubchik
2db62f686e
Merge branch '10.0' into 10.1
2015-03-07 13:21:02 +01:00
Sergei Golubchik
d61573d3e5
fix connect.json_udf test for static builds
2015-03-06 20:49:48 +01:00
Sergei Golubchik
c0af8213fe
MDEV-7669 tmp_table_count-7586 fails in ps and embedded
...
disable a broken test, pending a proper fix
2015-03-06 20:49:21 +01:00
Sergei Golubchik
5f510a9175
Merge branch '5.5' into 10.0
2015-03-06 18:41:32 +01:00
Sergei Golubchik
17a37796e1
after innodb/xtradb merge: use the correct visibility for internal functions
...
otherwise innodb plugin might invoke xtradb function with the same name,
and that might crash (./mtr --emb innodb.strict_mode)
2015-03-06 18:13:06 +01:00
Sergei Golubchik
d7d19071d2
MDEV-6838 Using too big key for internal temp tables
...
update test results after the fix
2015-03-06 17:03:46 +01:00
Sergei Golubchik
12d87c3ba5
MDEV-7659 buildbot may leave stale mysqld
...
safe_process puts its children (mysqld, in this case) into a separate
process group, to be able to kill it all at once.
buildslave kills mtr's process group when it loses connection to
the master.
result? buildslave kills mtr and safe_process, but leaves stale
mysqld processes in their own process groups.
fix: put safe_process itself into a separate process group, then
buildslave won't kill it and safe_process will kill mysqld'd
and itself when it will notice that the parent mtr no longer exists.
2015-03-06 11:15:55 +01:00
Jan Lindström
206b111b11
MDEV-7672: Crash creating an InnoDB table with foreign keys
...
Analysis: after a red-black-tree lookup we use node withouth
checking did lookup succeed or not. This lead to situation
where NULL-pointer was used.
Fix: Add additional check that found node from red-back-tree
is valid.
2015-03-06 11:19:23 +02:00
Sergey Vojtovich
e13459a11e
MDEV-7148 - Recurring: InnoDB: Failing assertion: !lock->recursive
...
Re-applied lost in the merge revision:
commit ed313e8a92
Author: Sergey Vojtovich <svoj@mariadb.org>
Date: Mon Dec 1 14:58:29 2014 +0400
MDEV-7148 - Recurring: InnoDB: Failing assertion: !lock->recursive
On PPC64 high-loaded server may crash due to assertion failure in InnoDB
rwlocks code.
This happened because load order between "recursive" and "writer_thread"
wasn't properly enforced.
2015-03-05 15:30:11 +04:00