diff options
| author | gluh@eagle.(none) <> | 2007-11-14 17:30:16 +0400 |
|---|---|---|
| committer | gluh@eagle.(none) <> | 2007-11-14 17:30:16 +0400 |
| commit | 58336411c9d624f0e99cf95aa5db22ec70dd0c6c (patch) | |
| tree | 4676d6947f9f56056b0b29957c90cba5cdad5eba /sql/sql_plugin.cc | |
| parent | 6223deb694946e5a2c3e46eaf4f2ce5624b5e78a (diff) | |
| parent | 95e7cccfee7f1b1df3e455fb5e6bc10ef49c2a3a (diff) | |
| download | mariadb-git-58336411c9d624f0e99cf95aa5db22ec70dd0c6c.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index c8d9116f196..ef4c63381e2 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1945,7 +1945,7 @@ static int check_func_enum(THD *thd, struct st_mysql_sys_var *var, length= sizeof(buff); if (!(str= value->val_str(value, buff, &length))) goto err; - if ((result= find_type(typelib, str, length, 1)-1) < 0) + if ((result= (long)find_type(typelib, str, length, 1)-1) < 0) { strvalue= str; goto err; |