diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-01-08 19:03:56 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-01-08 19:03:56 +0000 |
| commit | 9d8c117598092a05e92ae0921085bd2c511c744e (patch) | |
| tree | 189ec4f5502f19a5a31cd1b6a09beb965f2f87c7 /include | |
| parent | 28a68906d18814e346e39c687c7b725b1e1a4f50 (diff) | |
| parent | f5ec81002726a08401b7bbac7e6d485dc6b59126 (diff) | |
| download | mariadb-git-9d8c117598092a05e92ae0921085bd2c511c744e.tar.gz | |
merge: 5.1 -> 5.1-rpl
conflicts:
Text conflict in mysql-test/lib/mtr_report.pm
Text conflict in mysql-test/mysql-test-run.pl
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 5 | ||||
| -rw-r--r-- | include/hash.h | 2 | ||||
| -rw-r--r-- | include/thr_lock.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/config-win.h b/include/config-win.h index cc2b2767663..c111d14a17a 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. 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 @@ -371,6 +371,9 @@ inline double ulonglong2double(ulonglong value) #define HAVE_OPENSSL 1 #define HAVE_YASSL 1 +#define COMMUNITY_SERVER 1 +#define ENABLED_PROFILING 1 + /* Define charsets you want */ /* #undef HAVE_CHARSET_armscii8 */ /* #undef HAVE_CHARSET_ascii */ diff --git a/include/hash.h b/include/hash.h index 1f094d48585..f4b82454b81 100644 --- a/include/hash.h +++ b/include/hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. 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/include/thr_lock.h b/include/thr_lock.h index 77d428d1805..c7754ada299 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. 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 |