diff options
| author | unknown <mattiasj@mattiasj-laptop.(none)> | 2007-11-12 15:04:48 +0100 |
|---|---|---|
| committer | unknown <mattiasj@mattiasj-laptop.(none)> | 2007-11-12 15:04:48 +0100 |
| commit | e116210a36f784411fe81c662b65836e9f9c2568 (patch) | |
| tree | 5b503d74eb1d6ad6e8301df943e616549d8d9019 /sql | |
| parent | c04eeac1cf84f83356c6826e466a6b231cfcfe6c (diff) | |
| parent | 7642ea9ac7c3fc5de548e9d339dbf31659e40207 (diff) | |
| download | mariadb-git-e116210a36f784411fe81c662b65836e9f9c2568.tar.gz | |
Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-fixtopush
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index ac098d57c24..ad9eec1906a 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1866,7 +1866,7 @@ static int add_quoted_string(File fptr, const char *quotestr) String escapedstr; int err= add_string(fptr, "'"); err+= append_escaped(&escapedstr, &orgstr); - err+= add_string(fptr, escapedstr.c_ptr()); + err+= add_string(fptr, escapedstr.c_ptr_safe()); return err + add_string(fptr, "'"); } |