diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:27:24 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:27:24 -0400 |
| commit | 90e4f7f9d3f2669ac99f2817f884315bfc86b0a7 (patch) | |
| tree | 60a10a515a9f5656e797d8142f97b94f89f4e797 /sql/sql_trigger.cc | |
| parent | 586fab72f01e1c7f0f8bf363fa6b06a2f10965b4 (diff) | |
| parent | 5b7cab82195268f7657504d0b53995654748cefa (diff) | |
| download | mariadb-git-90e4f7f9d3f2669ac99f2817f884315bfc86b0a7.tar.gz | |
* bzr merge -rtag:mariadb-10.0.9 maria/10.0
* Fix for post-merge build failures.
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 682528f9766..d137c2ab7aa 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, 2011, Oracle and/or its affiliates. + Copyright (c) 2004, 2012, Oracle and/or its affiliates. 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 |