diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-12-09 11:20:50 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-12-09 11:20:50 +0200 |
| commit | 101fdd4eda0ad9af09939cafb042fda4812bcd1e (patch) | |
| tree | 465f1cf5128d68051a4742439bf4f69d5975b276 /sql/sql_yacc.yy | |
| parent | 89e77b65cd6999d1b6567f1744fbd35659d9d7b7 (diff) | |
| parent | 0f99fe728e9d32d8b6bf098775d1ef86235f8a47 (diff) | |
| download | mariadb-git-101fdd4eda0ad9af09939cafb042fda4812bcd1e.tar.gz | |
Content merge.
innobase/include/lock0lock.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/handler.h:
content merge.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8b3cdda5d9e..45f0236d0e8 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7387,8 +7387,8 @@ lock: { Lex->sql_command=SQLCOM_LOCK_TABLES; } - table_lock_list - {} + table_lock_list lock_engine_opt + {} ; table_or_tables: @@ -7414,6 +7414,15 @@ lock_option: | READ_SYM LOCAL_SYM { $$= TL_READ; } ; +lock_engine_opt: + /* empty */ + | WHERE + { + Lex->sql_command=SQLCOM_LOCK_TABLES_TRANSACTIONAL; + } + ENGINE_SYM opt_equal storage_engines + ; + unlock: UNLOCK_SYM table_or_tables { Lex->sql_command=SQLCOM_UNLOCK_TABLES; } ; |