diff options
| author | malff/marcsql@weblab.(none) <> | 2007-04-30 11:41:51 -0600 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-04-30 11:41:51 -0600 |
| commit | fa807c509de3d8631e49398de551715c3d686c68 (patch) | |
| tree | dff35bc95b339981991a3b68c6fd45b812eaa21e /sql/item.cc | |
| parent | 62fd6aa69664cf98d96458d30aa18b39b5b6bc1d (diff) | |
| parent | 012f841fd43a19c042aaec0af863f589b65f3f54 (diff) | |
| download | mariadb-git-fa807c509de3d8631e49398de551715c3d686c68.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-21513
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index bd5e0ae1a8f..78699ada921 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4711,7 +4711,6 @@ inline uint char_val(char X) Item_hex_string::Item_hex_string(const char *str, uint str_length) { - name=(char*) str-2; // Lex makes this start with 0x max_length=(str_length+1)/2; char *ptr=(char*) sql_alloc(max_length+1); if (!ptr) @@ -4822,7 +4821,6 @@ Item_bin_string::Item_bin_string(const char *str, uint str_length) uchar bits= 0; uint power= 1; - name= (char*) str - 2; max_length= (str_length + 7) >> 3; char *ptr= (char*) sql_alloc(max_length + 1); if (!ptr) |