database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +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); DBUG_RETURN(-1);
} }
thd->tablespace_op=FALSE;
error=table->file->discard_or_import_tablespace(discard); error=table->file->discard_or_import_tablespace(discard);
thd->proc_info="end"; thd->proc_info="end";
@ -1806,6 +1804,7 @@ int mysql_discard_or_import_tablespace(THD *thd,
} }
err: err:
close_thread_tables(thd); close_thread_tables(thd);
thd->tablespace_op=FALSE;
if (error == 0) { if (error == 0) {
send_ok(thd); send_ok(thd);
DBUG_RETURN(0); 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); mysql_ha_closeall(thd, table_list);
/* DISCARD/IMPORT TABLESPACE is always alone in an ALTER TABLE */
if (tablespace_op != NO_TABLESPACE_OP) if (tablespace_op != NO_TABLESPACE_OP)
DBUG_RETURN(mysql_discard_or_import_tablespace(thd,table_list, DBUG_RETURN(mysql_discard_or_import_tablespace(thd,table_list,
tablespace_op)); tablespace_op));

3
sql/sql_yacc.yy
View File

@ -4515,6 +4515,7 @@ keyword:
| DELAY_KEY_WRITE_SYM {} | DELAY_KEY_WRITE_SYM {}
| DES_KEY_FILE {} | DES_KEY_FILE {}
| DIRECTORY_SYM {} | DIRECTORY_SYM {}
| DISCARD {}
| DO_SYM {} | DO_SYM {}
| DUAL_SYM {} | DUAL_SYM {}
| DUMPFILE {} | DUMPFILE {}
@ -4546,6 +4547,7 @@ keyword:
| HOSTS_SYM {} | HOSTS_SYM {}
| HOUR_SYM {} | HOUR_SYM {}
| IDENTIFIED_SYM {} | IDENTIFIED_SYM {}
| IMPORT {}
| INDEXES {} | INDEXES {}
| ISOLATION {} | ISOLATION {}
| ISAM_SYM {} | ISAM_SYM {}
@ -4654,6 +4656,7 @@ keyword:
| SUBDATE_SYM {} | SUBDATE_SYM {}
| SUBJECT_SYM {} | SUBJECT_SYM {}
| SUPER_SYM {} | SUPER_SYM {}
| TABLESPACE {}
| TEMPORARY {} | TEMPORARY {}
| TEXT_SYM {} | TEXT_SYM {}
| TRANSACTION_SYM {} | TRANSACTION_SYM {}