diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
| commit | cb248f880619431850e5638009a6098048050edf (patch) | |
| tree | 32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /sql/sql_time.h | |
| parent | c0ac0b886047496e105a566a063bf1bd932d00a4 (diff) | |
| parent | 5543b75550962f07b4adcd47a6e52accec0a7d0f (diff) | |
| download | mariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_time.h')
| -rw-r--r-- | sql/sql_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index e0cab5cfa66..e3aa6bcb359 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -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 */ #ifndef SQL_TIME_INCLUDED #define SQL_TIME_INCLUDED |