diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 09:41:52 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 09:41:52 +0100 |
| commit | c73a0638c233f421bc17705d94e934d8fccfbe19 (patch) | |
| tree | 473650aff8d7f0e9366ff4b15b3dffee41d6188c /storage/spider | |
| parent | d0c6a05eb5cc6b856a523725607defb229252885 (diff) | |
| download | mariadb-git-c73a0638c233f421bc17705d94e934d8fccfbe19.tar.gz | |
remove append_escaped(), use String::append_for_single_quote() instead
Diffstat (limited to 'storage/spider')
| -rw-r--r-- | storage/spider/spd_db_conn.cc | 8 | ||||
| -rw-r--r-- | storage/spider/spd_db_mysql.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index 48c4b6ce4c6..459b450aacd 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -7909,7 +7909,7 @@ int spider_db_open_item_string( tmp_str.mem_calc(); str->q_append(SPIDER_SQL_VALUE_QUOTE_STR, SPIDER_SQL_VALUE_QUOTE_LEN); if ( - append_escaped(str->get_str(), tmp_str2) || + str->get_str()->append_for_single_quote(tmp_str2) || str->reserve(SPIDER_SQL_VALUE_QUOTE_LEN) ) DBUG_RETURN(HA_ERR_OUT_OF_MEM); @@ -9029,7 +9029,7 @@ int spider_db_udf_ping_table_append_mon_next( str->q_append(SPIDER_SQL_SELECT_STR, SPIDER_SQL_SELECT_LEN); str->q_append(SPIDER_SQL_PING_TABLE_STR, SPIDER_SQL_PING_TABLE_LEN); str->q_append(SPIDER_SQL_VALUE_QUOTE_STR, SPIDER_SQL_VALUE_QUOTE_LEN); - append_escaped(str->get_str(), child_table_name_str.get_str()); + str->get_str()->append_for_single_quote(child_table_name_str.get_str()); str->mem_calc(); str->q_append(SPIDER_SQL_VALUE_QUOTE_STR, SPIDER_SQL_VALUE_QUOTE_LEN); str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN); @@ -9040,7 +9040,7 @@ int spider_db_udf_ping_table_append_mon_next( str->q_append(limit_str, limit_str_length); str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN); str->q_append(SPIDER_SQL_VALUE_QUOTE_STR, SPIDER_SQL_VALUE_QUOTE_LEN); - append_escaped(str->get_str(), where_clause_str.get_str()); + str->get_str()->append_for_single_quote(where_clause_str.get_str()); str->mem_calc(); str->q_append(SPIDER_SQL_VALUE_QUOTE_STR, SPIDER_SQL_VALUE_QUOTE_LEN); str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN); @@ -9093,7 +9093,7 @@ int spider_db_udf_ping_table_append_select( )) DBUG_RETURN(HA_ERR_OUT_OF_MEM); if (use_where) - append_escaped(str->get_str(), where_str->get_str()); + str->get_str()->append_for_single_quote(where_str->get_str()); str->mem_calc(); str->q_append(SPIDER_SQL_LIMIT_STR, SPIDER_SQL_LIMIT_LEN); str->q_append(limit_str, limit_str_length); diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index a09b9e4a804..d9c008086f1 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -3717,7 +3717,7 @@ int spider_db_mysql_util::append_escaped_util( ) {
DBUG_ENTER("spider_db_mysql_util::append_escaped_util");
DBUG_PRINT("info",("spider this=%p", this));
- append_escaped(to->get_str(), from);
+ to->get_str()->append_for_single_quote(from);
to->mem_calc();
DBUG_RETURN(0);
}
|