diff options
| author | kostja@vajra.(none) <> | 2007-05-15 13:56:09 +0400 |
|---|---|---|
| committer | kostja@vajra.(none) <> | 2007-05-15 13:56:09 +0400 |
| commit | 7ff604eb76c9b6509a180596346c905f47b0f824 (patch) | |
| tree | f03054909cf94cfd088525d7139a12c45aa861cc /sql/item.cc | |
| parent | 7d006ee5386d5ae1f931657ee0eac5de2f3d102e (diff) | |
| parent | dcf7be8cf3e85f68fcf94d8bca83f426cc5fa831 (diff) | |
| download | mariadb-git-7ff604eb76c9b6509a180596346c905f47b0f824.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into vajra.(none):/opt/local/work/mysql-5.0-runtime
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 30486e7559a..74cf180e619 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4622,7 +4622,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) @@ -4733,7 +4732,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) |