diff options
author | unknown <monty@hundin.mysql.fi> | 2001-06-01 04:27:59 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-06-01 04:27:59 +0300 |
commit | e59d0778ecfb52f367d2bde43542dcde6a9c4aa1 (patch) | |
tree | ffdc7daed643167b8c8097cf1b60e75151d39eb9 /sql/sql_table.cc | |
parent | ef678c6ab4b1dbbb47b558e4fc1594cdd2a74f69 (diff) | |
download | mariadb-git-e59d0778ecfb52f367d2bde43542dcde6a9c4aa1.tar.gz |
Added support for symlinked tables.
myisamchk: Don't force a repair if the only problem was that the
open count wasn't correct.
Added missing error messages.
include/my_sys.h:
Cleanup comments
libmysql/Makefile.shared:
Added symlink library.
myisam/mi_check.c:
Added support for symlinked tables
myisam/mi_delete_table.c:
Added support for symlinked tables
myisam/mi_open.c:
Added support for symlinked tables
myisam/mi_rename.c:
Added support for symlinked tables
myisam/myisamchk.c:
Added support for symlinked tables.
Don't force a repair if the only problem was that the open count
wasn't correct.
pstack/bucomm.c:
use mkstemp() instead of mytemp()
sql/ha_myisam.cc:
Added support for symlinked tables
sql/ha_myisam.h:
Added support for symlinked tables
sql/ha_myisammrg.cc:
Added support for symlinked tables
sql/handler.cc:
Added support for symlinked tables
sql/handler.h:
Added support for symlinked tables
sql/lex.h:
Added support for symlinked tables
sql/share/czech/errmsg.txt:
Added missing error messages
sql/share/danish/errmsg.txt:
Added missing error messages
sql/share/dutch/errmsg.txt:
Added missing error messages
sql/share/estonian/errmsg.txt:
Added missing error messages
sql/share/french/errmsg.txt:
Added missing error messages
sql/share/german/errmsg.txt:
Added missing error messages
sql/share/greek/errmsg.txt:
Added missing error messages
sql/share/hungarian/errmsg.txt:
Added missing error messages
sql/share/italian/errmsg.txt:
Added missing error messages
sql/share/japanese/errmsg.txt:
Added missing error messages
sql/share/korean/errmsg.txt:
Added missing error messages
sql/share/norwegian-ny/errmsg.txt:
Added missing error messages
sql/share/norwegian/errmsg.txt:
Added missing error messages
sql/share/polish/errmsg.txt:
Added missing error messages
sql/share/portuguese/errmsg.txt:
Added missing error messages
sql/share/romanian/errmsg.txt:
Added missing error messages
sql/share/russian/errmsg.txt:
Added missing error messages
sql/share/slovak/errmsg.txt:
Added missing error messages
sql/share/spanish/errmsg.txt:
Added missing error messages
sql/share/swedish/errmsg.OLD:
Added missing error messages
sql/share/swedish/errmsg.txt:
Added missing error messages
sql/sql_db.cc:
Added support for symlinked tables
sql/sql_parse.cc:
Added support for symlinked tables
sql/sql_table.cc:
Added support for symlinked tables with ALTER TABLE
sql/sql_yacc.yy:
Added option to create symlinked tables.
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r-- | sql/sql_table.cc | 53 |
1 files changed, 50 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index c23c784ec14..69aa2a2c403 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1098,7 +1098,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, TABLE *table,*new_table; int error; char tmp_name[80],old_name[32],new_name_buff[FN_REFLEN], - *table_name,*db; + *table_name,*db; + char index_file[FN_REFLEN], data_file[FN_REFLEN]; bool use_timestamp=0; ha_rows copied,deleted; ulonglong next_insert_id; @@ -1120,10 +1121,11 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, { strmov(new_name_buff,new_name); fn_same(new_name_buff,table_name,3); + // Check if name changed #ifdef FN_LOWER_CASE - if (!my_strcasecmp(new_name_buff,table_name))// Check if name changed + if (!strcmp(db,new_db) && !my_strcasecmp(new_name_buff,table_name)) #else - if (!strcmp(new_name_buff,table_name)) // Check if name changed + if (!strcmp(db,new_db) && !strcmp(new_name_buff,table_name)) #endif new_name=table_name; // No. Make later check easier else @@ -1445,6 +1447,51 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, if (table->tmp_table) create_info->options|=HA_LEX_CREATE_TMP_TABLE; + /* + Handling of symlinked tables: + If no rename: + Create new data file and index file on the same disk as the + old data and index files. + Copy data. + Rename new data file over old data file and new index file over + old index file. + Symlinks are not changed. + + If rename: + Create new data file and index file on the same disk as the + old data and index files. Create also symlinks to point at + the new tables. + Copy data. + At end, rename temporary tables and symlinks to temporary table + to final table name. + Remove old table and old symlinks + + If rename is made to another database: + Create new tables in new database. + Copy data. + Remove old table and symlinks. + */ + + if (!strcmp(db, new_db)) // Ignore symlink if db changed + { + if (create_info->index_file_name) + { + /* Fix index_file_name to have 'tmp_name' as basename */ + strmov(index_file, tmp_name); + create_info->index_file_name=fn_same(index_file, + create_info->index_file_name, + 1); + } + if (create_info->data_file_name) + { + /* Fix data_file_name to have 'tmp_name' as basename */ + strmov(data_file, tmp_name); + create_info->data_file_name=fn_same(data_file, + create_info->data_file_name, + 1); + } + } + if ((error=mysql_create_table(thd, new_db, tmp_name, create_info, create_list,key_list,1,1))) // no logging |