diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-10-22 18:17:59 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-10-22 18:17:59 +0200 |
| commit | cecef1c56ecd595218cf08832e2e2fa68aa7c252 (patch) | |
| tree | a1be6428de363a1e7a89cd3384f3f72b7da57081 /sql/sql_partition.cc | |
| parent | 6f27ad15b208091d3904bb4f73ffab2871f99581 (diff) | |
| download | mariadb-git-cecef1c56ecd595218cf08832e2e2fa68aa7c252.tar.gz | |
BUG#46183, added character set identifier on character constants in VALUES part for column list partitioned tables to ensure constants are handled properly according to character sets
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 0a6a2b98941..8ec3d196c3b 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -2147,7 +2147,14 @@ static int add_column_list_values(File fptr, partition_info *part_info, return 1; } if (item_expr->result_type() == STRING_RESULT) + { + if (field_cs) + { + err+= add_string(fptr,"_"); + err+= add_string(fptr, field_cs->csname); + } err+= add_string(fptr,"'"); + } err+= add_string_object(fptr, res); if (item_expr->result_type() == STRING_RESULT) err+= add_string(fptr,"'"); |