diff options
| author | unknown <georg@lmy002.wdf.sap.corp> | 2005-06-15 15:58:56 +0200 |
|---|---|---|
| committer | unknown <georg@lmy002.wdf.sap.corp> | 2005-06-15 15:58:56 +0200 |
| commit | 7fdcb69b81cd4b49781da18adc8f5288bbe8322d (patch) | |
| tree | ed3bc59b629080d8529d0938d14f866104616987 /sql/item.h | |
| parent | e7a26a131394ae579601813408dad07208f3022f (diff) | |
| parent | 6393d0239d7f418126f354e820bb6dfb04e78501 (diff) | |
| download | mariadb-git-7fdcb69b81cd4b49781da18adc8f5288bbe8322d.tar.gz | |
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
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 4a86dfc60f3..820624afd2b 100644 --- a/sql/item.h +++ b/sql/item.h @@ -630,7 +630,7 @@ public: Item *it= this_item(); if (name) - it->set_name(name, strlen(name), system_charset_info); + it->set_name(name, (uint) strlen(name), system_charset_info); else it->set_name(m_name.str, m_name.length, system_charset_info); it->make_field(field); |