diff options
author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 16:34:31 +0300 |
---|---|---|
committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 16:34:31 +0300 |
commit | 4222b2520bdea2be41b50b888f930a63f5af8991 (patch) | |
tree | 02fcc81139a9a099f0d07c25d03e8b3f40f4c6b6 /sql/sql_trigger.cc | |
parent | 551ad1cf6f80ad1fab35746eee304d733baa9adf (diff) | |
parent | c7973615e723b13c6457b494b72be2fac35bfd18 (diff) | |
download | mariadb-git-4222b2520bdea2be41b50b888f930a63f5af8991.tar.gz |
Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r-- | sql/sql_trigger.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 65282de71cc..46f8100d9d1 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #define MYSQL_LEX 1 |