diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-31 14:15:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-31 14:15:52 +0200 |
| commit | 59408093d1add69dd4cd3d1674a73712528aed92 (patch) | |
| tree | 85e7d74ddb7c0a74c6c434b9c3dacfe9b7ebe2a3 /sql/item.h | |
| parent | a1fd37b1fd5803188d3f8b44914cca459f6e622f (diff) | |
| parent | 51e14492e9410718056b0c6d9d4dabd4a96e8070 (diff) | |
| download | mariadb-git-59408093d1add69dd4cd3d1674a73712528aed92.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 8855996b76c..98ec011d4b5 100644 --- a/sql/item.h +++ b/sql/item.h @@ -618,8 +618,8 @@ public: calls. */ uint name_length; /* Length of name */ + uint decimals; int8 marker; - uint8 decimals; bool maybe_null; /* If item may be null */ bool in_rollup; /* If used in GROUP BY list of a query with ROLLUP */ |