database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

sql_yacc.yy:

Browse Source 
Add DISCARD etc. in the keyword: rule of sql_yacc.yy
sql_table.cc:
  Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE
This commit is contained in:
heikki@hundin.mysql.fi
2003-10-14 01:52:03 +03:00
parent 1318470a96
commit f90253a7f8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@ -1779,8 +1779,6 @@ int mysql_discard_or_import_tablespace(THD *thd,
DBUG_RETURN(-1);
}
thd->tablespace_op=FALSE;
error=table->file->discard_or_import_tablespace(discard);
thd->proc_info="end";
@ -1806,6 +1804,7 @@ int mysql_discard_or_import_tablespace(THD *thd,
}
err:
close_thread_tables(thd);
thd->tablespace_op=FALSE;
if (error == 0) {
send_ok(thd);
DBUG_RETURN(0);
@ -1848,6 +1847,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
mysql_ha_closeall(thd, table_list);
/* DISCARD/IMPORT TABLESPACE is always alone in an ALTER TABLE */
if (tablespace_op != NO_TABLESPACE_OP)
DBUG_RETURN(mysql_discard_or_import_tablespace(thd,table_list,
tablespace_op));