summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0merge.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-20 22:06:55 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-20 22:06:55 +0200
commitbd3c8f47cd16b4795dd073bbd30decd804c76969 (patch)
tree684f91877eb6835e6335d614fafce9841eaf30af /storage/innobase/row/row0merge.cc
parentd529389358fb0c7f3e642d34d7fd84df307b9d29 (diff)
parentfd5c36bed5de65e85900c9fc9f0ed2092c4b38c5 (diff)
downloadmariadb-git-bd3c8f47cd16b4795dd073bbd30decd804c76969.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
-rw-r--r--storage/innobase/row/row0merge.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
index afa692fa139..3956eb40c5f 100644
--- a/storage/innobase/row/row0merge.cc
+++ b/storage/innobase/row/row0merge.cc
@@ -4266,6 +4266,7 @@ Provide a new pathname for a table that is being renamed if it belongs to
a file-per-table tablespace. The caller is responsible for freeing the
memory allocated for the return value.
@return new pathname of tablespace file, or NULL if space = 0 */
+static
char*
row_make_new_pathname(
/*==================*/