diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
| commit | a15234bf4bf98d7833996284c033fc53a981f5d4 (patch) | |
| tree | d989b448854f9d59de5ca16b962414591c8a5b2e /scripts | |
| parent | 9a6212008999da44b136605c1abf2cc9c7cc4b2c (diff) | |
| parent | e5e5877740f248de848219ee3a1d2881cd5c5b82 (diff) | |
| download | mariadb-git-a15234bf4bf98d7833996284c033fc53a981f5d4.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_system_tables_data.sql | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/wsrep_sst_common.sh | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql index 1f801226c2d..ab3dd704d2e 100644 --- a/scripts/mysql_system_tables_data.sql +++ b/scripts/mysql_system_tables_data.sql @@ -14,7 +14,7 @@ -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA -- --- The inital data for system tables of MySQL Server +-- The initial data for system tables of MySQL Server -- -- When setting up a "cross bootstrap" database (e.g., creating data on a Unix diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index 16607470f2c..16607470f2c 100755..100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh |