diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
| commit | d364b563a624aa320c13a291a6d135251e6b910d (patch) | |
| tree | 56c09cfd1053265897d114e4acb52d395185f27e /sql/sql_lex.cc | |
| parent | 8c84ab02b531c6101492eaa4a01cfd8b3606c047 (diff) | |
| parent | b056b295d3441cd1d40fbfe93f279d87b21f5950 (diff) | |
| download | mariadb-git-d364b563a624aa320c13a291a6d135251e6b910d.tar.gz | |
bzr merge from guilhem's maria tree to our local 5.1mariadb-merge-mysql-5.1.34plus
configure.in:
Manually merged
mysql-test/lib/My/ConfigFactory.pm:
Manually merged
mysql-test/mysql-test-run.pl:
Manually merged
mysql-test/t/information_schema.test:
Manually merged
sql/handler.cc:
Manually merged
support-files/mysql.spec.sh:
Manually merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 272c74917ad..1c1f3bbe06f 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1569,6 +1569,7 @@ void st_select_lex::init_query() exclude_from_table_unique_test= no_wrap_view_item= FALSE; nest_level= 0; link_next= 0; + lock_option= TL_READ_DEFAULT; } void st_select_lex::init_select() |