diff options
| author | Gleb Shchepa <gleb.shchepa@oracle.com> | 2011-04-08 12:09:24 +0400 |
|---|---|---|
| committer | Gleb Shchepa <gleb.shchepa@oracle.com> | 2011-04-08 12:09:24 +0400 |
| commit | b2fee393b029e5e2ec7c0a3161d665dad9fa720f (patch) | |
| tree | a882dbecbe9e5d691e50ad976300ec3274b5c79e /sql/item.h | |
| parent | bbd0d604aac36271bacbf007728d5a1db5151a53 (diff) | |
| parent | a77bc59896ee3cd89a8f1d391a65722b443f1841 (diff) | |
| download | mariadb-git-b2fee393b029e5e2ec7c0a3161d665dad9fa720f.tar.gz | |
manual merge 5.1-->5.5 (bug 11829681)
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 6cd91f03604..3e67ffacfc8 100644 --- a/sql/item.h +++ b/sql/item.h @@ -548,6 +548,10 @@ public: */ Item *next; uint32 max_length; /* Maximum length, in bytes */ + /* + TODO: convert name and name_length fields into String to keep them in sync + (see bug #11829681/60295 etc). + */ uint name_length; /* Length of name */ int8 marker; uint8 decimals; |