diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
| commit | a8d03ab23519d4afc288a6490676ddb8745e3e72 (patch) | |
| tree | e55f53ff3cc4b044769ca269561a933e3c93f05f /unittest/strings | |
| parent | 04f3ecf632816a940e2838949e0216d638436fd8 (diff) | |
| parent | 13fefeb04ade34418cd9d99aa93bffb69fdae27e (diff) | |
| download | mariadb-git-a8d03ab23519d4afc288a6490676ddb8745e3e72.tar.gz | |
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'unittest/strings')
| -rw-r--r-- | unittest/strings/Makefile.am | 2 | ||||
| -rw-r--r-- | unittest/strings/strings-t.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unittest/strings/Makefile.am b/unittest/strings/Makefile.am index 3e5a0f3e9cb..a3ab0a8c97e 100644 --- a/unittest/strings/Makefile.am +++ b/unittest/strings/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 2000, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 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 diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c index cb33af3ac03..7e61cb8722e 100644 --- a/unittest/strings/strings-t.c +++ b/unittest/strings/strings-t.c @@ -1,4 +1,4 @@ -/* Copyright 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 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 |