diff options
| author | unknown <kaa@polly.local> | 2006-09-12 19:35:44 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-09-12 19:35:44 +0400 |
| commit | 76f18d7ff0b76fd19495fae3b34c98ce33371a1c (patch) | |
| tree | 87937eb913a46a5ab21071c8d4e2bd3cdf9bbe7f /sql/item_func.h | |
| parent | b597aaf906b4bdda7fb7ccf34943fff4a077df58 (diff) | |
| parent | d31a3434650a9991bcc16478e65efd7d2ea23c76 (diff) | |
| download | mariadb-git-76f18d7ff0b76fd19495fae3b34c98ce33371a1c.tar.gz | |
Merge polly.local:/tmp/20924/bug20294/my50-bug20294
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/user_var.result:
Manual merge
mysql-test/t/user_var.test:
Manual merge
sql/item_func.cc:
Manual merge
sql/item_func.h:
Manual merge
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index c15b0b854b0..8abf5d91cd5 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1173,7 +1173,7 @@ public: String *val_str(String *str); my_decimal *val_decimal(my_decimal *); bool update_hash(void *ptr, uint length, enum Item_result type, - CHARSET_INFO *cs, Derivation dv, bool unsigned_arg= 0); + CHARSET_INFO *cs, Derivation dv, bool unsigned_arg); bool send(Protocol *protocol, String *str_arg); void make_field(Send_field *tmp_field); bool check(bool use_result_field); |