Skip to content

Commit 2d3e2c5

Browse files
mariadb-YuchenPeimariadb-YuchenPei
committed
Merge branch '10.11' into 11.1
2 parents 94999c1 + 22774dd commit 2d3e2c5

File tree

119 files changed

+1558
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1558
-303
lines changed

‎README.md

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
Code status:
2-
------------
1+
# Code status:
32

43
* [![Appveyor CI status](https://ci.appveyor.com/api/projects/status/4u6pexmtpuf8jq66?svg=true)](https://ci.appveyor.com/project/rasmushoj/server) ci.appveyor.com
54

6-
## MariaDB: The innovative open source database
5+
## MariaDB: The innovative open source database
76

87
MariaDB was designed as a drop-in replacement of MySQL(R) with more
98
features, new storage engines, fewer bugs, and better performance.
@@ -33,20 +32,19 @@ https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/
3332

3433
https://mariadb.com/kb/en/new-and-old-releases/
3534

36-
Getting the code, building it and testing it
37-
---------------------------------------------------------------
35+
# Getting the code, building it and testing it
3836

39-
Refer to the following guide: https://mariadb.org/get-involved/getting-started-for-developers/get-code-build-test/ which outlines how to correctly build the source code and run the MariaDB testing framework.
37+
Refer to the following guide: https://mariadb.org/get-involved/getting-started-for-developers/get-code-build-test/
38+
which outlines how to build the source code correctly and run the MariaDB testing framework,
39+
as well as which branch to target for your contributions.
4040

41-
Help
42-
-----
41+
# Help
4342

4443
More help is available from the Maria Discuss mailing list
4544
https://lists.mariadb.org/postorius/lists/discuss.lists.mariadb.org/ and MariaDB's Zulip
46-
instance, https://mariadb.zulipchat.com/
45+
instance, https://mariadb.zulipchat.com/
4746

48-
Licensing
49-
---------
47+
# Licensing
5048

5149
***************************************************************************
5250

@@ -60,8 +58,7 @@ license information can be found in the THIRDPARTY file.
6058

6159
***************************************************************************
6260

63-
Bug Reports
64-
------------
61+
# Bug Reports
6562

6663
Bug and/or error reports regarding MariaDB should be submitted at:
6764
https://jira.mariadb.org

‎client/mysqladmin.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ int main(int argc,char *argv[])
451451
is given a t!=0, we get an endless loop, or n iterations if --count=n
452452
was given an n!=0. If --sleep wasn't given, we get one iteration.
453453
454-
To wit, --wait loops the connection-attempts, while --sleep loops
454+
To wait, --wait loops the connection-attempts, while --sleep loops
455455
the command execution (endlessly if no --count is given).
456456
*/
457457

‎client/mysqldump.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5993,7 +5993,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
59935993
free_root(&glob_root, MYF(0));
59945994
}
59955995
maybe_die(EX_ILLEGAL_TABLE, "Couldn't find table: \"%s\"", *table_names);
5996-
/* We shall countinue here, if --force was given */
5996+
/* We shall continue here, if --force was given */
59975997
}
59985998
}
59995999
end= pos;
@@ -6014,7 +6014,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
60146014
free_root(&glob_root, MYF(0));
60156015
}
60166016
DB_error(mysql, "when doing LOCK TABLES");
6017-
/* We shall countinue here, if --force was given */
6017+
/* We shall continue here, if --force was given */
60186018
}
60196019
}
60206020
dynstr_free(&lock_tables_query);
@@ -6026,7 +6026,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
60266026
free_root(&glob_root, MYF(0));
60276027
DB_error(mysql, "when doing refresh");
60286028
}
6029-
/* We shall countinue here, if --force was given */
6029+
/* We shall continue here, if --force was given */
60306030
else
60316031
verbose_msg("-- dump_selected_tables : logs flushed successfully!\n");
60326032
}

‎client/mysqlimport.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ static void lock_table(MYSQL *mysql, int tablecount, char **raw_tablename)
429429
dynstr_append(&query, " WRITE,");
430430
}
431431
if (mysql_real_query(mysql, query.str, (ulong)query.length-1))
432-
db_error(mysql); /* We shall countinue here, if --force was given */
432+
db_error(mysql); /* We shall continue here, if --force was given */
433433
}
434434

435435

@@ -631,7 +631,7 @@ pthread_handler_t worker_thread(void *arg)
631631

632632
if (mysql_query(mysql, "/*!40101 set @@character_set_database=binary */;"))
633633
{
634-
db_error(mysql); /* We shall countinue here, if --force was given */
634+
db_error(mysql); /* We shall continue here, if --force was given */
635635
goto error;
636636
}
637637

@@ -759,12 +759,12 @@ int main(int argc, char **argv)
759759
if (!(mysql= db_connect(current_host,current_db,current_user,opt_password)))
760760
{
761761
free_defaults(argv_to_free);
762-
return(1); /* purecov: deadcode */
762+
return(1); /* purecov: dead code */
763763
}
764764

765765
if (mysql_query(mysql, "/*!40101 set @@character_set_database=binary */;"))
766766
{
767-
db_error(mysql); /* We shall countinue here, if --force was given */
767+
db_error(mysql); /* We shall continue here, if --force was given */
768768
return(1);
769769
}
770770

‎cmake/maintainer.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ FOREACH(F ${MY_WARNING_FLAGS})
4444
MY_CHECK_AND_SET_COMPILER_FLAG(${F} DEBUG RELWITHDEBINFO)
4545
ENDFOREACH()
4646

47-
SET(MY_ERROR_FLAGS -Werror)
47+
SET(MY_ERROR_FLAGS -Werror -fno-operator-names)
4848

4949
IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
5050
SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=maybe-uninitialized)

‎extra/mariabackup/backup_copy.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -901,14 +901,14 @@ bool is_system_table(const char *dbname, const char *tablename)
901901
DBUG_ASSERT(dbname);
902902
DBUG_ASSERT(tablename);
903903

904-
LEX_CSTRING lex_dbname;
905-
LEX_CSTRING lex_tablename;
904+
Lex_ident_db lex_dbname;
905+
Lex_ident_table lex_tablename;
906906
lex_dbname.str = dbname;
907907
lex_dbname.length = strlen(dbname);
908908
lex_tablename.str = tablename;
909909
lex_tablename.length = strlen(tablename);
910910

911-
TABLE_CATEGORY tg = get_table_category(&lex_dbname, &lex_tablename);
911+
TABLE_CATEGORY tg = get_table_category(lex_dbname, lex_tablename);
912912

913913
return (tg == TABLE_CATEGORY_LOG) || (tg == TABLE_CATEGORY_SYSTEM);
914914
}

‎extra/mariabackup/xtrabackup.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6996,7 +6996,7 @@ static bool check_all_privileges()
69966996
if (opt_galera_info || opt_slave_info
69976997
|| opt_safe_slave_backup) {
69986998
check_result |= check_privilege(granted_privileges,
6999-
"REPLICA MONITOR", "*", "*",
6999+
"SLAVE MONITOR", "*", "*",
70007000
PRIVILEGE_WARNING);
70017001
}
70027002

‎mysql-test/lib/My/Platform.pm

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use File::Path;
2323
use Carp;
2424

2525
use base qw(Exporter);
26-
our @EXPORT= qw(IS_CYGWIN IS_MSYS IS_WINDOWS IS_WIN32PERL IS_AIX IS_MAC
26+
our @EXPORT= qw(IS_CYGWIN IS_MSYS IS_WINDOWS IS_WIN32PERL IS_AIX IS_MAC IS_FREEBSD
2727
native_path posix_path mixed_path
2828
check_socket_path_length process_alive open_for_append);
2929

@@ -79,6 +79,15 @@ BEGIN {
7979
}
8080
}
8181

82+
BEGIN {
83+
if ($^O eq "freebsd") {
84+
eval 'sub IS_FREEBSD { 1 }';
85+
}
86+
else {
87+
eval 'sub IS_FREEBSD { 0 }';
88+
}
89+
}
90+
8291
#
8392
# native_path
8493
# Convert from path format used by perl to the underlying

‎mysql-test/main/analyze_engine_stats2.opt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--innodb_buffer_pool_dump_at_shutdown=off --innodb_buffer_pool_load_at_startup=off --innodb-stats-persistent=1 --innodb-stats-auto-recalc=off

‎mysql-test/main/analyze_engine_stats2.result

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
#
2+
# MDEV-34125: ANALYZE FORMAT=JSON: r_engine_stats.pages_read_time_ms has wrong scale
3+
#
4+
create table t1 (
5+
a varchar(255),
6+
b varchar(255),
7+
c varchar(255),
8+
d varchar(255),
9+
primary key(a,b,c,d)
10+
) engine=innodb;
11+
SET STATEMENT unique_checks=0,foreign_key_checks=0 FOR
12+
insert into t1 select
13+
repeat(uuid(), 7),
14+
repeat(uuid(), 7),
15+
repeat(uuid(), 7),
16+
repeat(uuid(), 7)
17+
from seq_1_to_16384;
18+
SET GLOBAL innodb_fast_shutdown=0;
19+
# restart
20+
set log_slow_verbosity='engine';
21+
set long_query_time=0.0;
22+
set @js='$analyze_output';
23+
select @js;
24+
@js
25+
{
26+
"query_optimization": {
27+
"r_total_time_ms": "REPLACED"
28+
},
29+
"query_block": {
30+
"select_id": 1,
31+
"cost": 0.011647987,
32+
"r_loops": 1,
33+
"r_total_time_ms": "REPLACED",
34+
"nested_loop": [
35+
{
36+
"table": {
37+
"table_name": "t1",
38+
"access_type": "index",
39+
"key": "PRIMARY",
40+
"key_length": "1028",
41+
"used_key_parts": ["a", "b", "c", "d"],
42+
"loops": 1,
43+
"r_loops": 1,
44+
"rows": 1,
45+
"r_rows": 16384,
46+
"cost": 0.0110178,
47+
"r_table_time_ms": "REPLACED",
48+
"r_other_time_ms": "REPLACED",
49+
"r_engine_stats": {
50+
"pages_accessed": "REPLACED",
51+
"pages_read_count": "REPLACED",
52+
"pages_read_time_ms": "REPLACED"
53+
},
54+
"filtered": 100,
55+
"r_filtered": 100
56+
}
57+
}
58+
]
59+
}
60+
}
61+
set @pages_read_time_ms=
62+
(select json_value(@js,'$.query_block.nested_loop[0].table.r_engine_stats.pages_read_time_ms'));
63+
64+
65+
OK: pages_read_time is same in slow log and ANALYZE
66+
67+
set long_query_time=default;
68+
drop table t1;

0 commit comments

Comments
 (0)