summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.h
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 19:15:57 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 19:15:57 +0300
commitf177f125d4bfa8817833960286a5f18efe2fef1f (patch)
tree12c6aa853460beb2ff9510d0547c55586dccfa83 /sql/sql_join_cache.h
parent3e8cab51cb78f3e60e139af944eef8f25502fc81 (diff)
parent15f1e03d46dfa704beeed4880ed72c0163869dc3 (diff)
downloadmariadb-git-f177f125d4bfa8817833960286a5f18efe2fef1f.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_join_cache.h')
-rw-r--r--sql/sql_join_cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h
index 4ae843ebfc2..1cbc6acfd79 100644
--- a/sql/sql_join_cache.h
+++ b/sql/sql_join_cache.h
@@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This file contains declarations for implementations