diff options
| author | unknown <svoj@mysql.com> | 2005-10-10 23:53:53 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-10-10 23:53:53 +0500 |
| commit | f08fdca3043a976f6625bca8fcb0c2cd24ee892a (patch) | |
| tree | 26b50042762d684389eda925a63c8133540a234e /sql/table.cc | |
| parent | 57ef8576816c4104e519838bef09b9ad6a77842c (diff) | |
| download | mariadb-git-f08fdca3043a976f6625bca8fcb0c2cd24ee892a.tar.gz | |
Always save/restore connect string.
sql/table.cc:
If extra block present always restore connect string.
sql/unireg.cc:
Always save connect string.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sql/table.cc b/sql/table.cc index c9a1544e4d2..f78e196a29e 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -316,17 +316,14 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, my_free(buff, MYF(0)); goto err; } - if (share->db_type == DB_TYPE_FEDERATED_DB) + share->connect_string.length= uint2korr(buff); + if (! (share->connect_string.str= strmake_root(&outparam->mem_root, + next_chunk + 2, share->connect_string.length))) { - share->connect_string.length= uint2korr(buff); - if (! (share->connect_string.str= strmake_root(&outparam->mem_root, - next_chunk + 2, share->connect_string.length))) - { - my_free(buff, MYF(0)); - goto err; - } - next_chunk+= share->connect_string.length + 2; + my_free(buff, MYF(0)); + goto err; } + next_chunk+= share->connect_string.length + 2; buff_end= buff + n_length; if (next_chunk + 2 < buff_end) { |