diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:45:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:45:25 +0200 |
| commit | f72a7659976089dc6f727bb31e8a91306199cf57 (patch) | |
| tree | 0199cd1bf1c16b01b358ab88e5dce5b038349872 /sql/sql_profile.cc | |
| parent | ed06ba3492d55c9e9dde231b55352f854e5e4b50 (diff) | |
| parent | 1fd8150a5b5e3f56aa3c253225929a07ee9a4026 (diff) | |
| download | mariadb-git-f72a7659976089dc6f727bb31e8a91306199cf57.tar.gz | |
5.2 merge.
two tests still fail:
main.innodb_icp and main.range_vs_index_merge_innodb
call records_in_range() with both range ends being open
(which triggers an assert)
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index 9e45a34f794..8919157ea33 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2007, 2010, Oracle and/or its affiliates. - Copyright (c) 2008-2011 Monty Program Ab + Copyright (c) 2007, 2012, Oracle and/or its affiliates. + Copyright (c) 2008, 2012, Monty Program Ab 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 @@ -82,8 +82,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 */ |