diff options
author | unknown <monty@mysql.com> | 2003-12-10 00:00:20 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2003-12-10 00:00:20 +0200 |
commit | 6b97c26a29127f73c699aaa13ffb5ae9f33703cf (patch) | |
tree | 3974a0549628cd8fca7b70530e3d0443783de374 /sql | |
parent | 4e85bf326e8051533bb680d1a612813705dc789d (diff) | |
download | mariadb-git-6b97c26a29127f73c699aaa13ffb5ae9f33703cf.tar.gz |
Added checking of return value from my_once_alloc() in charset
Added checking of return value from malloc() in reg_init()
client/mysqltest.c:
Added comment
dbug/dbug.c:
Removed not needed test
mysys/charset.c:
Added checking of return value from my_once_alloc()
regex/reginit.c:
Abort if out of memory in reg_init() (unlikely)
sql/item_strfunc.cc:
Added comment
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index dd1ec6bd2da..40b18755744 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2043,6 +2043,10 @@ String* Item_func_export_set::val_str(String* str) null_value=1; return 0; } + /* + Arg count can only be 3, 4 or 5 here. This is guaranteed from the + grammar for EXPORT_SET() + */ switch(arg_count) { case 5: num_set_values = (uint) args[4]->val_int(); |