diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
commit | be85d3e61bb4217453a6879cb28d9bd369ad17dd (patch) | |
tree | c1ec0aab43cf0df71d88b8278367a79aabc43f52 /sql/item_subselect.cc | |
parent | c0bc9480e73242b075178cb5da5713ba9d84be7c (diff) | |
parent | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff) | |
download | mariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index cb43362ac96..538b2c218de 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /** @file |