diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
| commit | c58d9d9a9dda3037db574bbf97b22e7c1c274e02 (patch) | |
| tree | 54ccfe80d1405cb4325209020ea3c34d86a60770 /sql/sql_lex.h | |
| parent | 33fc0d53b543032accea2476a4eed0522cead2bb (diff) | |
| download | mariadb-git-c58d9d9a9dda3037db574bbf97b22e7c1c274e02.tar.gz | |
Fixes after merge with 4.0
mysql-test/r/heap_btree.result:
Updated results
mysql-test/r/heap_hash.result:
Updated results
mysql-test/r/merge.result:
Updated results
mysql-test/r/rpl_log.result:
Updated results
mysql-test/r/select.result:
Updated results
mysql-test/r/subselect.result:
Updated results
sql/item_cmpfunc.h:
Fix after merge
sql/log_event.cc:
Fix after merge
sql/mysql_priv.h:
Fix after merge
sql/sql_acl.cc:
Fix after merge
sql/sql_class.cc:
Fix after merge
sql/sql_db.cc:
Fix after merge
sql/sql_delete.cc:
Fix after merge
sql/sql_lex.cc:
Fix after merge
sql/sql_lex.h:
Fix after merge
sql/sql_parse.cc:
Fix after merge
sql/sql_update.cc:
Fix after merge
sql/sql_yacc.yy:
Fix after merge
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 9f8e3200246..dd41af4b250 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -239,7 +239,7 @@ public: thr_lock_type flags= TL_UNLOCK, List<String> *use_index= 0, List<String> *ignore_index= 0); - + virtual void set_lock_for_tables(thr_lock_type lock_type) {} void mark_as_dependent(st_select_lex *last); private: void fast_exclude(); @@ -364,6 +364,7 @@ public: thr_lock_type flags= TL_UNLOCK, List<String> *use_index= 0, List<String> *ignore_index= 0); + void set_lock_for_tables(thr_lock_type lock_type); inline void init_order() { order_list.elements= 0; |