summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2014-01-30 12:45:38 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2014-01-30 12:45:38 -0500
commit4a6be51f78e79b1ee5bc0442b7af8b3108a64512 (patch)
treec9a15dc1470ff64aa82fe3afdb23503d044e4299 /mysys
parent5b6a4f25a566f967e8b1010998a22256bd045511 (diff)
downloadmariadb-git-4a6be51f78e79b1ee5bc0442b7af8b3108a64512.tar.gz
* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files. * Fixed some compiler warnings.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_delete.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_delete.c b/mysys/my_delete.c
index c1a821e90c2..bd81f98ed62 100644
--- a/mysys/my_delete.c
+++ b/mysys/my_delete.c
@@ -150,4 +150,5 @@ error:
my_osmaperr(last_error);
DBUG_RETURN(-1);
}
-#endif \ No newline at end of file
+#endif
+