summaryrefslogtreecommitdiff
path: root/include/sql_common.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-07-30 15:09:25 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-07-30 15:09:25 +0300
commit91181b225c574f65720b9ecf218a4122209a7248 (patch)
tree5a9c835e8823f29ee26f8b56a3458607448188a1 /include/sql_common.h
parentd17e9a02c4a08da9ac1b8f4c653f29f067d75a22 (diff)
parentfceda2dab6f8ea6c042f910cbc1d07d5df0cbc3c (diff)
downloadmariadb-git-91181b225c574f65720b9ecf218a4122209a7248.tar.gz
Merge 5.5 into 10.0
Diffstat (limited to 'include/sql_common.h')
-rw-r--r--include/sql_common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sql_common.h b/include/sql_common.h
index 9c67034d798..34b2a093e43 100644
--- a/include/sql_common.h
+++ b/include/sql_common.h
@@ -1,6 +1,6 @@
#ifndef SQL_COMMON_INCLUDED
#define SQL_COMMON_INCLUDED
-/* Copyright (c) 2003, 2012, Oracle and/or its affiliates.
+/* Copyright (c) 2003, 2018, Oracle and/or its affiliates.
Copyright (c) 2010, 2018, MariaDB
This program is free software; you can redistribute it and/or modify