summaryrefslogtreecommitdiff
path: root/mysys/my_getsystime.c
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2019-11-21 16:27:50 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2019-11-21 16:27:50 +0100
commit3ad054170cafc9dc90b18f4e857f3a10545fc06d (patch)
tree067bf277718686c4468a6187633f881443dcfca6 /mysys/my_getsystime.c
parent9c0e462ff28b93127406eeb2db4b763423fabbe3 (diff)
parent6718d3bc3241f72e07504133371cf3813d2e6fe9 (diff)
downloadmariadb-git-3ad054170cafc9dc90b18f4e857f3a10545fc06d.tar.gz
These changed were made after pulling 10.2.30 from origin
--------------------------------------------------------- - Temporarily fix MDEV-13782 by commenting out LIKE_FUNC i, CondFilter modified: storage/connect/ha_connect.cc - Make Rest available for MariaDB binary distributed versions. modified: storage/connect/CMakeLists.txt - Remove unused declaration modified: storage/connect/filter.h
Diffstat (limited to 'mysys/my_getsystime.c')
-rw-r--r--mysys/my_getsystime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c
index 1cedeb21d6e..e2e6e8e398a 100644
--- a/mysys/my_getsystime.c
+++ b/mysys/my_getsystime.c
@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include "mysys_priv.h"