database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-03-09 00:02:13 +04:00
parent 7b9029b17f ec8c38a82e
commit fa2a3480c4
223 changed files with 2382 additions and 6114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@ -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;