Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Conflicts: mysql-test/r/func_json.result mysql-test/r/win.result mysql-test/t/func_json.test mysql-test/t/win.test sql/share/errmsg-utf8.txt storage/rocksdb/ha_rocksdb.cc storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
MariaDB · Aug 7, 2017 · 988a9da · 988a9da
2 parents 0f1cadd + 30c36b2
commit 988a9da
Show file tree

Hide file tree

Showing 250 changed files with 14,381 additions and 2,729 deletions.
diff --git a/.travis.compiler.sh b/.travis.compiler.sh
@@ -8,8 +8,8 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then
       CMAKE_OPT="${CMAKE_OPT} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
     fi
     case ${GCC_VERSION} in
-      5) CXX=clang++-3.9 ;;
-      6) CXX=clang++-4.0 ;;
+      5) CXX=clang++-4.0 ;;
+      6) CXX=clang++-5.0 ;;
     esac
     export CXX CC=${CXX/++/}
   elif [[ "${CXX}" == 'g++' ]]; then

diff --git a/.travis.yml b/.travis.yml
@@ -136,18 +136,17 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty
-      - llvm-toolchain-trusty-3.9
       - llvm-toolchain-trusty-4.0
+      - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main'
     packages: # make sure these match the build requirements
       - gcc-5
       - g++-5
       - gcc-6
       - g++-6
-      - clang-3.9
-      - llvm-3.9-dev
       - clang-4.0
       - llvm-4.0-dev
+      - clang-5.0
+      - llvm-5.0-dev
       - libasan0
       - bison
       - chrpath

diff --git a/debian/mariadb-server-core-10.2.install b/debian/mariadb-server-core-10.2.install
@@ -10,6 +10,7 @@ usr/share/mysql/estonian
 usr/share/mysql/french
 usr/share/mysql/german
 usr/share/mysql/greek
+usr/share/mysql/hindi
 usr/share/mysql/hungarian
 usr/share/mysql/italian
 usr/share/mysql/japanese

diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result
@@ -230,7 +230,7 @@ insert into t2 (a) values (1023);
 do (f2(23));
 Warnings:
 Error	1062	Duplicate entry '23' for key 'a'
-Note	4070	At line 4 in test.f2
+Note	4091	At line 4 in test.f2
 select * from t2;
 a
 1023

diff --git a/mysql-test/r/create_drop_binlog.result b/mysql-test/r/create_drop_binlog.result
@@ -160,7 +160,7 @@ Note	1050	Table 'v1' already exists
 DROP VIEW IF EXISTS v1;
 DROP VIEW IF EXISTS v1;
 Warnings:
-Note	4068	Unknown VIEW: 'test.v1'
+Note	4089	Unknown VIEW: 'test.v1'
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 #	#	Format_desc	1	#	VER

diff --git a/mysql-test/r/create_drop_view.result b/mysql-test/r/create_drop_view.result
@@ -55,5 +55,5 @@ id
 DROP VIEW IF EXISTS v1;
 DROP VIEW IF EXISTS v1;
 Warnings:
-Note	4068	Unknown VIEW: 'test.v1'
+Note	4089	Unknown VIEW: 'test.v1'
 DROP TABLE t1;
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
@@ -209,10 +209,10 @@ Note	1051	Unknown table 'test.table1'
 Note	1051	Unknown table 'test.table2'
 DROP VIEW IF EXISTS view1,view2,view3,view4;
 Warnings:
-Note	4068	Unknown VIEW: 'test.view1'
-Note	4068	Unknown VIEW: 'test.view2'
-Note	4068	Unknown VIEW: 'test.view3'
-Note	4068	Unknown VIEW: 'test.view4'
+Note	4089	Unknown VIEW: 'test.view1'
+Note	4089	Unknown VIEW: 'test.view2'
+Note	4089	Unknown VIEW: 'test.view3'
+Note	4089	Unknown VIEW: 'test.view4'
 
 # Test error message when trigger does not find table
 CREATE TABLE table1(a int);

diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result
@@ -642,6 +642,12 @@ SELECT JSON_KEYS(f) FROM t1 ORDER BY 1;
 JSON_KEYS(f)
 NULL
 DROP TABLE t1;
+SELECT JSON_EXTRACT( '{"foo":"bar"}', '$[*].*' );
+JSON_EXTRACT( '{"foo":"bar"}', '$[*].*' )
+NULL
+SELECT JSON_EXTRACT( '{"foo":"bar"}', '$[*]' );
+JSON_EXTRACT( '{"foo":"bar"}', '$[*]' )
+NULL
 #
 # Start of 10.3 tests
 #

diff --git a/mysql-test/r/get_diagnostics.result b/mysql-test/r/get_diagnostics.result
@@ -590,7 +590,7 @@ DROP PROCEDURE p1;
 SHOW WARNINGS;
 Level	Code	Message
 Error	54321	MESSAGE_TEXT text
-Note	4070	At line 16 in test.p1
+Note	4091	At line 16 in test.p1
 CREATE PROCEDURE p1()
 BEGIN
 DECLARE var INT;

diff --git a/mysql-test/r/gis-json.result b/mysql-test/r/gis-json.result
@@ -61,6 +61,34 @@ POINT(102 0.5)
 SELECT st_astext(st_geomfromgeojson('{ "type": "FeatureCollection", "features": [{ "type": "Feature", "geometry": { "type": "Point", "coordinates": [102.0, 0.5] }, "properties": { "prop0": "value0" } }]}'));
 st_astext(st_geomfromgeojson('{ "type": "FeatureCollection", "features": [{ "type": "Feature", "geometry": { "type": "Point", "coordinates": [102.0, 0.5] }, "properties": { "prop0": "value0" } }]}'))
 GEOMETRYCOLLECTION(POINT(102 0.5))
+SELECT ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',5));
+ERROR HY000: Incorrect option value: '5' for function ST_GeometryFromJSON
+SELECT ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',1));
+ERROR 22023: Invalid GIS data provided to function ST_GeometryFromJSON.
+SELECT ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',2));
+ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',2))
+POINT(5.3 15)
+SELECT ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',3));
+ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',3))
+POINT(5.3 15)
+SELECT ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',4));
+ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',4))
+POINT(5.3 15)
+SELECT ST_AsGeoJSON(ST_GeomFromText('POINT(5.363 7.266)'),2);
+ST_AsGeoJSON(ST_GeomFromText('POINT(5.363 7.266)'),2)
+{"type": "Point", "coordinates": [5.36, 7.27]}
+SELECT ST_AsGeoJSON(ST_GeomFromText('POINT(5.363 7.266)'),1);
+ST_AsGeoJSON(ST_GeomFromText('POINT(5.363 7.266)'),1)
+{"type": "Point", "coordinates": [5.4, 7.3]}
+SELECT ST_AsGeoJSON(ST_GeomFromText('POINT(5.363 7.266)'),10);
+ST_AsGeoJSON(ST_GeomFromText('POINT(5.363 7.266)'),10)
+{"type": "Point", "coordinates": [5.363, 7.266]}
+SELECT ST_AsGeoJSON(ST_GeomFromText("POINT(10 11)"), 100, 1);
+ST_AsGeoJSON(ST_GeomFromText("POINT(10 11)"), 100, 1)
+{"bbox": [10, 11, 10, 11], "type": "Point", "coordinates": [10, 11]}
+SELECT ST_AsGeoJSON(ST_GeomFromText("POINT(10 11)"), 100, 5);
+ST_AsGeoJSON(ST_GeomFromText("POINT(10 11)"), 100, 5)
+{"bbox": [10, 11, 10, 11], "type": "Point", "coordinates": [10, 11]}
 #
 # End of 10.2 tests
 #
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
@@ -1428,7 +1428,7 @@ Warnings:
 Note	1305	FUNCTION test.test_function does not exist
 drop view if exists v1;
 Warnings:
-Note	4068	Unknown VIEW: 'test.v1'
+Note	4089	Unknown VIEW: 'test.v1'
 create table test (col1 varchar(30));
 create function test_function() returns varchar(30)
 begin

diff --git a/mysql-test/r/profiling.result b/mysql-test/r/profiling.result
@@ -415,7 +415,7 @@ select @@profiling;
 drop table if exists t1, t2, t3;
 drop view if exists v1;
 Warnings:
-Note	4068	Unknown VIEW: 'test.v1'
+Note	4089	Unknown VIEW: 'test.v1'
 drop function if exists f1;
 set session profiling = OFF;
 set global profiling_history_size= @start_value;

diff --git a/mysql-test/r/signal.result b/mysql-test/r/signal.result
@@ -1715,7 +1715,7 @@ show warnings $$
 Level	Code	Message
 Warning	1012	Raising a warning
 Error	5555	RESIGNAL to not found
-Note	4070	At line 9 in test.test_resignal
+Note	4091	At line 9 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -1740,7 +1740,7 @@ show warnings $$
 Level	Code	Message
 Warning	1012	Raising a warning
 Error	5555	RESIGNAL to error
-Note	4070	At line 9 in test.test_resignal
+Note	4091	At line 9 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -1789,7 +1789,7 @@ show warnings $$
 Level	Code	Message
 Error	1012	Raising a not found
 Error	5555	RESIGNAL to not found
-Note	4070	At line 9 in test.test_resignal
+Note	4091	At line 9 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -1814,7 +1814,7 @@ show warnings $$
 Level	Code	Message
 Error	1012	Raising a not found
 Error	5555	RESIGNAL to error
-Note	4070	At line 9 in test.test_resignal
+Note	4091	At line 9 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -1863,7 +1863,7 @@ show warnings $$
 Level	Code	Message
 Error	1012	Raising an error
 Error	5555	RESIGNAL to not found
-Note	4070	At line 9 in test.test_resignal
+Note	4091	At line 9 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -1888,7 +1888,7 @@ show warnings $$
 Level	Code	Message
 Error	1012	Raising an error
 Error	5555	RESIGNAL to error
-Note	4070	At line 9 in test.test_resignal
+Note	4091	At line 9 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -1931,7 +1931,7 @@ show warnings $$
 Level	Code	Message
 Warning	1264	Out of range value for column 'a' at row 1
 Error	5555	RESIGNAL to a not found
-Note	4070	At line 8 in test.test_resignal
+Note	4091	At line 8 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -1953,7 +1953,7 @@ show warnings $$
 Level	Code	Message
 Warning	1264	Out of range value for column 'a' at row 1
 Error	5555	RESIGNAL to an error
-Note	4070	At line 8 in test.test_resignal
+Note	4091	At line 8 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -2004,7 +2004,7 @@ show warnings $$
 Level	Code	Message
 Error	1329	No data - zero rows fetched, selected, or processed
 Error	5555	RESIGNAL to a not found
-Note	4070	At line 10 in test.test_resignal
+Note	4091	At line 10 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -2030,7 +2030,7 @@ show warnings $$
 Level	Code	Message
 Error	1329	No data - zero rows fetched, selected, or processed
 Error	5555	RESIGNAL to an error
-Note	4070	At line 10 in test.test_resignal
+Note	4091	At line 10 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -2073,7 +2073,7 @@ show warnings $$
 Level	Code	Message
 Error	1051	Unknown table 'test.no_such_table'
 Error	5555	RESIGNAL to a not found
-Note	4070	At line 8 in test.test_resignal
+Note	4091	At line 8 in test.test_resignal
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -2095,7 +2095,7 @@ show warnings $$
 Level	Code	Message
 Error	1051	Unknown table 'test.no_such_table'
 Error	5555	RESIGNAL to an error
-Note	4070	At line 8 in test.test_resignal
+Note	4091	At line 8 in test.test_resignal
 drop procedure test_resignal $$
 #
 # More complex cases
@@ -2142,7 +2142,7 @@ ERROR 42000: Hi, I am a useless error message
 show warnings $$
 Level	Code	Message
 Error	9999	Hi, I am a useless error message
-Note	4070	At line 7 in test.peter_p2
+Note	4091	At line 7 in test.peter_p2
 drop procedure peter_p1 $$
 drop procedure peter_p2 $$
 CREATE PROCEDURE peter_p1 ()
@@ -2198,16 +2198,16 @@ Level	Code	Message
 Error	1231	Variable 'sql_mode' can't be set to the value of 'NULL'
 Error	1232	Variable 'sql_mode' can't be set to the value of 'NULL'
 Error	9999	Variable 'sql_mode' can't be set to the value of 'NULL'
-Note	4070	At line 8 in test.peter_p1
+Note	4091	At line 8 in test.peter_p1
 ERROR 42000: Hi, I am a useless error message
 show warnings $$
 Level	Code	Message
 Error	1231	Variable 'sql_mode' can't be set to the value of 'NULL'
 Error	1232	Variable 'sql_mode' can't be set to the value of 'NULL'
 Error	9999	Variable 'sql_mode' can't be set to the value of 'NULL'
-Note	4070	At line 8 in test.peter_p1
+Note	4091	At line 8 in test.peter_p1
 Error	9999	Hi, I am a useless error message
-Note	4070	At line 10 in test.peter_p2
+Note	4091	At line 10 in test.peter_p2
 drop procedure peter_p1 $$
 drop procedure peter_p2 $$
 drop procedure if exists peter_p3 $$
@@ -2225,7 +2225,7 @@ show warnings $$
 Level	Code	Message
 Error	1	Original
 Error	2	Original
-Note	4070	At line 4 in test.peter_p3
+Note	4091	At line 4 in test.peter_p3
 drop procedure peter_p3 $$
 drop table t_warn;
 drop table t_cursor;

diff --git a/mysql-test/r/signal_demo3.result b/mysql-test/r/signal_demo3.result
@@ -79,23 +79,23 @@ show warnings;
 Level	Code	Message
 Error	1051	Unknown table 'demo.oops_it_is_not_here'
 Error	1644	Oops in proc_9
-Note	4070	At line 4 in demo.proc_9
+Note	4091	At line 4 in demo.proc_9
 Error	1644	Oops in proc_8
-Note	4070	At line 4 in demo.proc_8
+Note	4091	At line 4 in demo.proc_8
 Error	1644	Oops in proc_7
-Note	4070	At line 4 in demo.proc_7
+Note	4091	At line 4 in demo.proc_7
 Error	1644	Oops in proc_6
-Note	4070	At line 4 in demo.proc_6
+Note	4091	At line 4 in demo.proc_6
 Error	1644	Oops in proc_5
-Note	4070	At line 4 in demo.proc_5
+Note	4091	At line 4 in demo.proc_5
 Error	1644	Oops in proc_4
-Note	4070	At line 4 in demo.proc_4
+Note	4091	At line 4 in demo.proc_4
 Error	1644	Oops in proc_3
-Note	4070	At line 4 in demo.proc_3
+Note	4091	At line 4 in demo.proc_3
 Error	1644	Oops in proc_2
-Note	4070	At line 4 in demo.proc_2
+Note	4091	At line 4 in demo.proc_2
 Error	1644	Oops in proc_1
-Note	4070	At line 4 in demo.proc_1
+Note	4091	At line 4 in demo.proc_1
 SET @@session.max_error_count = 5;
 SELECT @@session.max_error_count;
 @@session.max_error_count
@@ -104,11 +104,11 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Note	4070	At line 4 in demo.proc_3
+Note	4091	At line 4 in demo.proc_3
 Error	1644	Oops in proc_2
-Note	4070	At line 4 in demo.proc_2
+Note	4091	At line 4 in demo.proc_2
 Error	1644	Oops in proc_1
-Note	4070	At line 4 in demo.proc_1
+Note	4091	At line 4 in demo.proc_1
 SET @@session.max_error_count = 7;
 SELECT @@session.max_error_count;
 @@session.max_error_count
@@ -117,13 +117,13 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Note	4070	At line 4 in demo.proc_4
+Note	4091	At line 4 in demo.proc_4
 Error	1644	Oops in proc_3
-Note	4070	At line 4 in demo.proc_3
+Note	4091	At line 4 in demo.proc_3
 Error	1644	Oops in proc_2
-Note	4070	At line 4 in demo.proc_2
+Note	4091	At line 4 in demo.proc_2
 Error	1644	Oops in proc_1
-Note	4070	At line 4 in demo.proc_1
+Note	4091	At line 4 in demo.proc_1
 SET @@session.max_error_count = 9;
 SELECT @@session.max_error_count;
 @@session.max_error_count
@@ -132,15 +132,15 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Note	4070	At line 4 in demo.proc_5
+Note	4091	At line 4 in demo.proc_5
 Error	1644	Oops in proc_4
-Note	4070	At line 4 in demo.proc_4
+Note	4091	At line 4 in demo.proc_4
 Error	1644	Oops in proc_3
-Note	4070	At line 4 in demo.proc_3
+Note	4091	At line 4 in demo.proc_3
 Error	1644	Oops in proc_2
-Note	4070	At line 4 in demo.proc_2
+Note	4091	At line 4 in demo.proc_2
 Error	1644	Oops in proc_1
-Note	4070	At line 4 in demo.proc_1
+Note	4091	At line 4 in demo.proc_1
 drop database demo;
 SET @@global.max_error_count = @start_global_value;
 SELECT @@global.max_error_count;

diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
@@ -1990,8 +1990,8 @@ Warning	1264	Out of range value for column 'a' at row 1
 Note	1292	Truncated incorrect INTEGER value: '222222 '
 Warning	1264	Out of range value for column 'b' at row 1
 Error	1048	Column 'c' cannot be null
-Note	4070	At line 6 in test.t1_bi
-Note	4070	At line 2 in test.p1
+Note	4091	At line 6 in test.t1_bi
+Note	4091	At line 2 in test.p1
 
 DROP TABLE t1;
 DROP TABLE t2;