diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-02 13:47:00 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-02 13:47:00 +0300 |
| commit | b67d11e17ca6ae8b4b0a0d5a5b5fccceff641a26 (patch) | |
| tree | e5581eaf73302fbd721a4c17983fb6fdfca266d0 /sql/sql_parse.cc | |
| parent | fc14066488c52252779495a411fee6de2e478192 (diff) | |
| download | mariadb-git-b67d11e17ca6ae8b4b0a0d5a5b5fccceff641a26.tar.gz | |
Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
Fix that DROP DATABASE works with all table types
Use BULK_INSERT when inserting more than one row
Better TRUNCATE TABLE
BitKeeper/deleted/.del-compilation_finished.au.gz~70bd14095a918139:
Delete: sounds/compilation_finished.au.gz
BUILD/FINISH.sh:
Removed 'finished' sound as this isn't a general solution.
Docs/manual.texi:
Added upgrading from 3.23
configure.in:
Fixed version number
sql/ha_innobase.cc:
Default creation of InnoDB tables.
sql/ha_myisam.cc:
Disable BULK_INSERT of using safe mode
sql/handler.cc:
Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
sql/handler.h:
Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
sql/lock.cc:
Added lock_and_wait_for_table_name
sql/mysql_priv.h:
Better TRUNCATE TABLE
sql/sql_db.cc:
Fix that DROP DATABASE works with all table types
sql/sql_delete.cc:
Better TRUNCATE TABLE
sql/sql_insert.cc:
Use BULK_INSERT when inserting more than one row
sql/sql_load.cc:
Small bug fix.
sql/sql_parse.cc:
Better TRUNCATE TABLE
sql/sql_select.cc:
Change INNOBASE -> INNODB
sql/sql_table.cc:
Better TRUNCATE TABLE
sql/sql_yacc.yy:
INNOBASE -> INNODB
sql/thr_malloc.cc:
Fix for replication
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c43540d77e6..dac9af6d9fb 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1619,9 +1619,19 @@ mysql_execute_command(void) break; } case SQLCOM_TRUNCATE: - select_lex->where=0; - select_lex->select_limit=HA_POS_ERROR; - /* Fall through */ + if (check_access(thd,DELETE_ACL,tables->db,&tables->grant.privilege)) + goto error; /* purecov: inspected */ + /* + Don't allow this within a transaction because we want to use + re-generate table + */ + if (thd->locked_tables || thd->active_transaction()) + { + my_error(ER_LOCK_OR_ACTIVE_TRANSACTION,MYF(0)); + goto error; + } + res=mysql_truncate(thd,tables); + break; case SQLCOM_DELETE: { if (check_access(thd,DELETE_ACL,tables->db,&tables->grant.privilege)) @@ -1958,9 +1968,13 @@ mysql_execute_command(void) net_printf(&thd->net,ER_WRONG_DB_NAME, lex->name); break; } - if (check_access(thd,DROP_ACL,lex->name,0,1) || - end_active_trans(thd)) + if (check_access(thd,DROP_ACL,lex->name,0,1)) break; + if (thd->locked_tables || thd->active_transaction()) + { + my_error(ER_LOCK_OR_ACTIVE_TRANSACTION,MYF(0)); + goto error; + } mysql_rm_db(thd,lex->name,lex->drop_if_exists); break; } |