#At file:///Users/mattiasj/mysql-bzr/topush-5.5/ based on revid:mattias.jonsson@stripped
3283 Mattias Jonsson 2011-01-28 [merge]
merge
modified:
sql/item_timefunc.h
=== modified file 'sql/item_timefunc.h'
--- a/sql/item_timefunc.h 2011-01-28 12:28:15 +0000
+++ b/sql/item_timefunc.h 2011-01-28 12:39:39 +0000
@@ -1,7 +1,7 @@
#ifndef ITEM_TIMEFUNC_INCLUDED
#define ITEM_TIMEFUNC_INCLUDED
-/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
No bundle (reason: revision is a merge).
| Thread |
|---|
| • bzr commit into mysql-5.5 branch (mattias.jonsson:3283) | Mattias Jonsson | 28 Jan |