diff options
| author | unknown <tomas@poseidon.(none)> | 2004-09-06 10:47:04 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-09-06 10:47:04 +0000 |
| commit | 862d056d4a238c580f01d662f9533bb86894fc63 (patch) | |
| tree | c0284b46721f242643e099825453df1d77d31438 /sql/sql_table.cc | |
| parent | c7e942a8ff90fe6100518361129209a7cd5ab48d (diff) | |
| parent | 3d390679e41f69a1b8d1c8b0599fac93ae16ac07 (diff) | |
| download | mariadb-git-862d056d4a238c580f01d662f9533bb86894fc63.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
sql/sql_class.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 7eb50a14a91..d490a5f03f4 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1579,7 +1579,7 @@ static int prepare_for_restore(THD* thd, TABLE_LIST* table, reg_ext)) DBUG_RETURN(-1); // protect buffer overflow - my_snprintf(dst_path, sizeof(dst_path), "%s/%s/%s", + my_snprintf(dst_path, sizeof(dst_path), "%s%s/%s", mysql_real_data_home, db, table_name); if (lock_and_wait_for_table_name(thd,table)) |