diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-04 22:00:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-04 22:00:24 +0200 |
| commit | 49c853fb948aeaeb5c7e3f02da3f14da51ee4100 (patch) | |
| tree | 8c3d487a02209cc0c6f126144f1340fc5897d527 /sql/sql_update.cc | |
| parent | ae18a28500974351cf42fa3cac67c83e0647d510 (diff) | |
| parent | 4c87f727734955f9e4a0ffde25aae4d43ec0b2a5 (diff) | |
| download | mariadb-git-49c853fb948aeaeb5c7e3f02da3f14da51ee4100.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 6c4d864e75a..f616549097b 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2011, 2013, Monty Program Ab. + Copyright (c) 2011, 2015, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1520,7 +1520,7 @@ int mysql_multi_update_prepare(THD *thd) */ lex->select_lex.exclude_from_table_unique_test= FALSE; - if (lex->select_lex.save_prep_leaf_tables(thd)) + if (lex->save_prep_leaf_tables()) DBUG_RETURN(TRUE); DBUG_RETURN (FALSE); |