diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /plugin/user_variables | |
parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
parent | cb248f880619431850e5638009a6098048050edf (diff) | |
download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'plugin/user_variables')
-rw-r--r-- | plugin/user_variables/user_variables.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/user_variables/user_variables.cc b/plugin/user_variables/user_variables.cc index 35378e0c8c8..0dfd1b4db94 100644 --- a/plugin/user_variables/user_variables.cc +++ b/plugin/user_variables/user_variables.cc @@ -11,7 +11,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 02111-1335 USA */ #define MYSQL_SERVER #include <sql_class.h> |