diff options
| author | unknown <monty@narttu.mysql.fi> | 2000-10-11 00:48:03 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2000-10-11 00:48:03 +0300 |
| commit | 3c7bb7902a0b5f789db7329e51801c8495f38f09 (patch) | |
| tree | c6677bb9b8f4eee0143a25aa5b5b345004edc2ff /sql/sql_string.h | |
| parent | f3078422da127c27b82a3726f5ded7d7fa5034d5 (diff) | |
| download | mariadb-git-3c7bb7902a0b5f789db7329e51801c8495f38f09.tar.gz | |
Portability fixes
Docs/manual.texi:
Update for Access 2000
extra/perror.c:
Added --silent
include/my_pthread.h:
Patch for windows
scripts/safe_mysqld.sh:
Fix of bug in --patch
sql/sql_lex.cc:
Allow numbers of type 1e1
sql/sql_string.h:
Safety fix
sql/sql_table.cc:
Portability fix
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 8711cf314ad..45c82b82dd0 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -100,16 +100,16 @@ public: bool set(ulonglong num); bool set(double num,uint decimals=2); inline void free() + { + if (alloced) { - if (alloced) - { - alloced=0; - Alloced_length=0; - my_free(Ptr,MYF(0)); - Ptr=0; - } + alloced=0; + Alloced_length=0; + my_free(Ptr,MYF(0)); + Ptr=0; + str_length=0; /* Safety */ } - + } inline bool alloc(uint32 arg_length) { if (arg_length < Alloced_length) |