diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-21 14:50:03 +0300 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-21 14:50:03 +0300 |
| commit | 41f17a87074eeeb173ce3b75c4293fabdade8aae (patch) | |
| tree | 0494999be141ccd9f626e86427b958c8116e2cd6 /sql/item.cc | |
| parent | c37ad60ef1eafa7ef52164422ee49b4a35c72d8b (diff) | |
| parent | e2db8e6ccb2655ec5706305b491540ad3f1c8267 (diff) | |
| download | mariadb-git-41f17a87074eeeb173ce3b75c4293fabdade8aae.tar.gz | |
5.1-bugteam->5.5-bugteam merge
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index b1e453121bd..18a88d64470 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5839,6 +5839,10 @@ bool Item::send(Protocol *protocol, String *buffer) String *res; if ((res=val_str(buffer))) result= protocol->store(res->ptr(),res->length(),res->charset()); + else + { + DBUG_ASSERT(null_value); + } break; } case MYSQL_TYPE_TINY: |