database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42

Browse Source
This commit is contained in:
Sergei Golubchik
2015-02-11 23:50:40 +01:00
parent 63108dc9d2 3ee8aa216d
commit 8e80f91fa3
54 changed files with 1215 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2013 Oracle and/or its affiliates.
Copyright (c) 2009, 2013 Monty Program Ab.
/* Copyright (c) 2000, 2014 Oracle and/or its affiliates.
Copyright (c) 2009, 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