diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-09 00:02:13 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-09 00:02:13 +0400 |
| commit | fa2a3480c487b1a72e623a6800a2064866f90490 (patch) | |
| tree | 7d3b90da71e04f14905cf3fb977344deb1a1871c /sql/sql_table.cc | |
| parent | 7b9029b17fe055bafd60d34eeedcead86dd98af5 (diff) | |
| parent | ec8c38a82ec1bb00f681a3f6662bd5c76ebb7c75 (diff) | |
| download | mariadb-git-fa2a3480c487b1a72e623a6800a2064866f90490.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
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 df943d9fc26..728416c8df6 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; |