summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-03-21 23:41:28 +0200
committerunknown <monty@mysql.com>2005-03-21 23:41:28 +0200
commit802c41e04d0b4bb193abfff1b7084d3a6c971df6 (patch)
tree0dc25c2b0b090f45da0eec51acfbcb6d42180cd6 /sql/sql_string.h
parent2ba3544f0e053d95e82b9a899fd9b86cbb19b9ce (diff)
downloadmariadb-git-802c41e04d0b4bb193abfff1b7084d3a6c971df6.tar.gz
Cleanups during review of code
Fixed newly introduced bug in rollup client/mysqldump.c: Safer buffer allocation Removed wrong assert mysql-test/r/olap.result: more tests mysql-test/t/olap.test: more tests sql/handler.cc: Simple cleanup Fixed wrong check for next digit (wrong debug output) sql/item.cc: Replace shrink_to_length() with mark_as_const() as the former allowed one to do changes to the string sql/item_sum.cc: Change reference to pointer Trivial optimzation of testing 'allways_null' sql/mysqld.cc: Proper indentation of comment sql/sql_select.cc: Fixed newly introduced bug in rollup sql/sql_string.h: Remove not needed 'shrink_to_length()' Added 'mark_as_const()' to be used when one want to ensure that a string is not changed
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index fc1e9f171b6..7ece9885040 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -84,6 +84,7 @@ public:
inline char& operator [] (uint32 i) const { return Ptr[i]; }
inline void length(uint32 len) { str_length=len ; }
inline bool is_empty() { return (str_length == 0); }
+ inline void mark_as_const() { Alloced_length= 0;}
inline const char *ptr() const { return Ptr; }
inline char *c_ptr()
{
@@ -205,10 +206,6 @@ public:
}
}
}
- inline void shrink_to_length()
- {
- Alloced_length= str_length;
- }
bool is_alloced() { return alloced; }
inline String& operator = (const String &s)
{