diff options
author | Luis Soares <luis.soares@oracle.com> | 2011-07-11 17:19:56 +0100 |
---|---|---|
committer | Luis Soares <luis.soares@oracle.com> | 2011-07-11 17:19:56 +0100 |
commit | 25df755040116e3bc95c3d21cbabf0bbe309aa00 (patch) | |
tree | 86efc55c73e3bb3184c0a310cdab42e5bfcdb51b /sql/sql_yacc.yy | |
parent | 438d21189c2dd9494723aefd26c0f491fefb3e6a (diff) | |
parent | e018925a64dc40f22bd6f370ccc732f75185a4d9 (diff) | |
download | mariadb-git-25df755040116e3bc95c3d21cbabf0bbe309aa00.tar.gz |
BUG#12695969
Manually merged from mysql-5.1:
- fixed mysqlbinlog copyright year: 2001 --> 2000
- fixed address in license header
conflicts
=========
- client/mysqlbinlog.cc
- include/welcome_copyright_notice.h
Diffstat (limited to 'sql/sql_yacc.yy')
0 files changed, 0 insertions, 0 deletions