summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-10-17 10:18:17 +0200
committerSergei Golubchik <serg@mariadb.org>2017-10-17 10:18:17 +0200
commitdf5f25fa7a2c9f43f0506b2ef98dc00033a5c557 (patch)
treea817540a283821a9badd4e704ca79b7c57d1d1e0 /sql/ha_partition.cc
parentb036b6b59464524d7dd54a4c9a75b5ee8a14dbe0 (diff)
parent1da916c37e5107b27297fc9e22c3da7772bb097d (diff)
downloadmariadb-git-df5f25fa7a2c9f43f0506b2ef98dc00033a5c557.tar.gz
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index b2c2140d4dc..bc2f597d5b0 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2005, 2013, Oracle and/or its affiliates.
+ Copyright (c) 2005, 2017, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2017, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1747,7 +1748,7 @@ int ha_partition::change_partitions(HA_CREATE_INFO *create_info,
cleanup_new_partition(part_count);
DBUG_RETURN(error);
}
-
+
DBUG_PRINT("info", ("Add partition %s", part_name_buff));
if ((error= prepare_new_partition(table, create_info,
new_file_array[i],