diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-08 23:47:20 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-08 23:47:20 +0400 |
| commit | ec8c38a82ec1bb00f681a3f6662bd5c76ebb7c75 (patch) | |
| tree | b3a7cc7930787be4474ac8abf1663ae92abacba3 /sql/sql_table.cc | |
| parent | 47b7ffb396bd283bd4196194311ba39ed9692421 (diff) | |
| parent | 5da6bd7b959af4a9755556afedde8f34d95c679a (diff) | |
| download | mariadb-git-ec8c38a82ec1bb00f681a3f6662bd5c76ebb7c75.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 4834e10da3d..7c06ff96c32 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2010, 2016, MariaDB + Copyright (c) 2010, 2017, MariaDB Corporation. 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 @@ -2845,7 +2845,7 @@ bool check_duplicates_in_interval(const char *set_or_name, */ bool Column_definition::prepare_create_field(uint *blob_columns, - longlong table_flags) + ulonglong table_flags) { uint dup_val_count; uint decimals_orig= decimals; |