diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:25:57 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:25:57 +0200 |
| commit | 1ede2dd8146254951493081f2297b0832fdd4d13 (patch) | |
| tree | 2cb0c6d427fa7624b0acc5898cc6fd647152b6c2 /sql/sql_profile.cc | |
| parent | 767501fb54f19adf3c136e5131daf11e34b3f039 (diff) | |
| download | mariadb-git-1ede2dd8146254951493081f2297b0832fdd4d13.tar.gz | |
Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)
This patch fixes various compilation warnings of the type
"error: narrowing conversion of 'x' from 'datatype1' to
'datatype2'
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index 1a6477e4c4d..49666dde476 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. 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 @@ -84,8 +84,8 @@ ST_FIELD_INFO query_profile_statistics_info[]= int make_profile_table_for_show(THD *thd, ST_SCHEMA_TABLE *schema_table) { - int profile_options = thd->lex->profile_options; - int fields_include_condition_truth_values[]= { + uint profile_options = thd->lex->profile_options; + uint fields_include_condition_truth_values[]= { FALSE, /* Query_id */ FALSE, /* Seq */ TRUE, /* Status */ |