Skip to content

Commit b7914f5

Browse files
dr-mdr-m
committed
Merge 10.8 into 10.9
2 parents 21ef68d + d7a4ce3 commit b7914f5

File tree

227 files changed

+2337
-4469
lines changed

Some content is hidden

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

227 files changed

+2337
-4469
lines changed

‎BUILD/FINISH.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,15 @@ commands="$commands
6262
path=`dirname $0`
6363
. \"$path/autorun.sh\""
6464

65-
if [ -z "$just_clean" ]
65+
if [ -z "$just_clean"]
6666
then
67-
commands="$commands
68-
git submodule update
69-
CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" $configure"
67+
if test -d .git
68+
then
69+
commands="$commands
70+
git submodule update"
71+
fi
72+
commands="$commands
73+
CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" $configure"
7074
fi
7175

7276
if [ -z "$just_configure" -a -z "$just_clean" ]

‎debian/mariadb-test-data.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# These should be moved, see https://jira.mariadb.org/browse/MDEV-21654
22
arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
3+
arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
34
arch-independent-package-contains-binary-or-object usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
5+
arch-independent-package-contains-binary-or-object [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
46
# Mainly for support for *BSD family. Not right way to do but this is test package and not for production
57
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/std_data/checkDBI_DBD-MariaDB.pl]
68
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl]

‎debian/mariadb-test.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# These should be moved, see https://jira.mariadb.org/browse/MDEV-21653
22
arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
33
arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version
4+
arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process]
5+
arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version]
46
# Mainly for support for *BSD family. Not right way to do but this is test package and not for production
57
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/process-purecov-annotations.pl]
68
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/v1/mysql-test-run.pl]

‎debian/source/lintian-overrides

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,20 @@ version-substvar-for-external-package Replaces (line 748) ${source:Version} mari
2828
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.9
2929
# ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
3030
source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
31+
source-is-missing [storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2]
3132
# Must be fixed upstream
3233
source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-*.custom.js
34+
# New Lintian syntax (from version 2.115)
35+
source-is-missing [sql/share/charsets/languages.html]
36+
source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html]
3337
# Intentional control relationships
3438
version-substvar-for-external-package Replaces * libmariadbd-dev -> libmariadbclient-dev
3539
version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqlclient-dev
3640
version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqld-dev
41+
# New Lintian syntax (from version 2.115)
42+
version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqlclient-dev [debian/control:*]
43+
version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqld-dev [debian/control:*]
44+
version-substvar-for-external-package Replaces * libmariadbd-dev -> libmariadbclient-dev [debian/control:*]
3745
# Data or test files where long lines are justified
3846
very-long-line-length-in-source-file *.test *
3947
very-long-line-length-in-source-file *.result *

‎include/mysql/plugin.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,18 @@ struct system_status_var;
204204
typedef int (*mysql_show_var_func)(MYSQL_THD, struct st_mysql_show_var*, void *, struct system_status_var *status_var, enum enum_var_type);
205205

206206

207+
static inline
208+
struct st_mysql_show_var SHOW_FUNC_ENTRY(const char *name,
209+
mysql_show_var_func func_arg)
210+
{
211+
struct st_mysql_show_var tmp;
212+
tmp.name= name;
213+
tmp.value= (void*) func_arg;
214+
tmp.type= SHOW_FUNC;
215+
return tmp;
216+
};
217+
218+
207219
/*
208220
Constants for plugin flags.
209221
*/

‎include/mysql/plugin_audit.h.pp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,16 @@
517517
};
518518
struct system_status_var;
519519
typedef int (*mysql_show_var_func)(THD*, struct st_mysql_show_var*, void *, struct system_status_var *status_var, enum enum_var_type);
520+
static inline
521+
struct st_mysql_show_var SHOW_FUNC_ENTRY(const char *name,
522+
mysql_show_var_func func_arg)
523+
{
524+
struct st_mysql_show_var tmp;
525+
tmp.name= name;
526+
tmp.value= (void*) func_arg;
527+
tmp.type= SHOW_FUNC;
528+
return tmp;
529+
};
520530
struct st_mysql_sys_var;
521531
struct st_mysql_value;
522532
typedef int (*mysql_var_check_func)(THD* thd,

‎include/mysql/plugin_auth.h.pp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,16 @@
517517
};
518518
struct system_status_var;
519519
typedef int (*mysql_show_var_func)(THD*, struct st_mysql_show_var*, void *, struct system_status_var *status_var, enum enum_var_type);
520+
static inline
521+
struct st_mysql_show_var SHOW_FUNC_ENTRY(const char *name,
522+
mysql_show_var_func func_arg)
523+
{
524+
struct st_mysql_show_var tmp;
525+
tmp.name= name;
526+
tmp.value= (void*) func_arg;
527+
tmp.type= SHOW_FUNC;
528+
return tmp;
529+
};
520530
struct st_mysql_sys_var;
521531
struct st_mysql_value;
522532
typedef int (*mysql_var_check_func)(THD* thd,

‎include/mysql/plugin_data_type.h.pp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,16 @@
517517
};
518518
struct system_status_var;
519519
typedef int (*mysql_show_var_func)(THD*, struct st_mysql_show_var*, void *, struct system_status_var *status_var, enum enum_var_type);
520+
static inline
521+
struct st_mysql_show_var SHOW_FUNC_ENTRY(const char *name,
522+
mysql_show_var_func func_arg)
523+
{
524+
struct st_mysql_show_var tmp;
525+
tmp.name= name;
526+
tmp.value= (void*) func_arg;
527+
tmp.type= SHOW_FUNC;
528+
return tmp;
529+
};
520530
struct st_mysql_sys_var;
521531
struct st_mysql_value;
522532
typedef int (*mysql_var_check_func)(THD* thd,

‎include/mysql/plugin_encryption.h.pp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,16 @@
517517
};
518518
struct system_status_var;
519519
typedef int (*mysql_show_var_func)(THD*, struct st_mysql_show_var*, void *, struct system_status_var *status_var, enum enum_var_type);
520+
static inline
521+
struct st_mysql_show_var SHOW_FUNC_ENTRY(const char *name,
522+
mysql_show_var_func func_arg)
523+
{
524+
struct st_mysql_show_var tmp;
525+
tmp.name= name;
526+
tmp.value= (void*) func_arg;
527+
tmp.type= SHOW_FUNC;
528+
return tmp;
529+
};
520530
struct st_mysql_sys_var;
521531
struct st_mysql_value;
522532
typedef int (*mysql_var_check_func)(THD* thd,

‎include/mysql/plugin_ftparser.h.pp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,16 @@
517517
};
518518
struct system_status_var;
519519
typedef int (*mysql_show_var_func)(THD*, struct st_mysql_show_var*, void *, struct system_status_var *status_var, enum enum_var_type);
520+
static inline
521+
struct st_mysql_show_var SHOW_FUNC_ENTRY(const char *name,
522+
mysql_show_var_func func_arg)
523+
{
524+
struct st_mysql_show_var tmp;
525+
tmp.name= name;
526+
tmp.value= (void*) func_arg;
527+
tmp.type= SHOW_FUNC;
528+
return tmp;
529+
};
520530
struct st_mysql_sys_var;
521531
struct st_mysql_value;
522532
typedef int (*mysql_var_check_func)(THD* thd,

0 commit comments

Comments
 (0)