summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-03-15 16:07:28 +0200
committerunknown <monty@mysql.com>2005-03-15 16:07:28 +0200
commitef7ebed4135a7ddc85c194d632ac7d6308995769 (patch)
treeaed7f185cf908cbc9dc83d45ef1c53191c23011d /sql/table.cc
parent722ffa879f27e9914ce557f7dc1f80a5acdf6134 (diff)
downloadmariadb-git-ef7ebed4135a7ddc85c194d632ac7d6308995769.tar.gz
Code cleanups during review of pushed code
sql/mysql_priv.h: Added 'const' to some arguments sql/sp_head.cc: Added comments code cleanup acceess -> access sql/sql_acl.cc: Simply code by making check_routine_level_acl() available also in embedded server sql/sql_acl.h: Added 'const' to some arguments sql/sql_parse.cc: Added 'const' to some arguments Fixed the check_rounte_level_acl() is always called (old code didn't properly check access privilges if grant_option was not set) sql/sql_show.cc: Simplify usage of get_field() Now we can always call check_some_routine_access() sql/sql_udf.cc: Don't give warnings for suspicios UDF's if --log-warnings isn't given sql/table.cc: Simplify usage of get_field()
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 63da10c687a..939690395d4 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1390,8 +1390,12 @@ bool get_field(MEM_ROOT *mem, Field *field, String *res)
field->val_str(&str);
if (!(length= str.length()))
+ {
+ res->length(0);
return 1;
- to= strmake_root(mem, str.ptr(), length);
+ }
+ if (!(to= strmake_root(mem, str.ptr(), length)))
+ length= 0; // Safety fix
res->set(to, length, ((Field_str*)field)->charset());
return 0;
}