diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-02 15:45:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-12 10:16:45 +0200 |
| commit | 735203e6de5c6db5fb7fcd09f908ce45ee992d7d (patch) | |
| tree | 2731449ad4819ee82844bb856dd933956857485f /sql | |
| parent | 47573cee4daeaeee75574c382b6bc699848afdf1 (diff) | |
| download | mariadb-git-735203e6de5c6db5fb7fcd09f908ce45ee992d7d.tar.gz | |
cleanup: quoted_string
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 1 | ||||
| -rw-r--r-- | sql/mysqld.h | 1 | ||||
| -rw-r--r-- | sql/sql_db.cc | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 97b2299defc..af817894cf4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -304,7 +304,6 @@ static TYPELIB tc_heuristic_recover_typelib= const char *first_keyword= "first"; const char *my_localhost= "localhost", *delayed_user= "DELAYED"; -const char *quoted_string= "%`s"; bool opt_large_files= sizeof(my_off_t) > 4; static my_bool opt_autocommit; ///< for --autocommit command-line option diff --git a/sql/mysqld.h b/sql/mysqld.h index 7a616097338..3b2a887d764 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -302,7 +302,6 @@ extern my_bool encrypt_binlog; extern my_bool encrypt_tmp_disk_tables, encrypt_tmp_files; extern ulong encryption_algorithm; extern const char *encryption_algorithm_names[]; -extern const char *quoted_string; #ifdef HAVE_PSI_INTERFACE #ifdef HAVE_MMAP diff --git a/sql/sql_db.cc b/sql/sql_db.cc index f9463f9ace7..5f826e37a76 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -993,8 +993,7 @@ update_binlog: if (ha_table_exists(thd, &tbl->db, &tbl->table_name)) continue; - tbl_name_len= my_snprintf(quoted_name, sizeof(quoted_name), - quoted_string, + tbl_name_len= my_snprintf(quoted_name, sizeof(quoted_name), "%`s", tbl->table_name.str); tbl_name_len++; /* +1 for the comma */ if (query_pos + tbl_name_len + 1 >= query_end) |