diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:02:55 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:02:55 +0000 |
| commit | b4c0c1550cd3aa53851b0344a433d8b7eea67d9c (patch) | |
| tree | 9909bd321761de0c8085748ac06b4a431906e670 /mysql-test/t/mysqld--help-win.test | |
| parent | 18a8f3c8cc00f8bfa59f982fcf39edb89d941ef0 (diff) | |
| parent | a6165accb3279fe64b672fa0eeaa30ef12cf6557 (diff) | |
| download | mariadb-git-b4c0c1550cd3aa53851b0344a433d8b7eea67d9c.tar.gz | |
merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
Text conflict in sql/sql_insert.cc
Diffstat (limited to 'mysql-test/t/mysqld--help-win.test')
| -rw-r--r-- | mysql-test/t/mysqld--help-win.test | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/t/mysqld--help-win.test b/mysql-test/t/mysqld--help-win.test index 416beb1d34c..56cfec8999b 100644 --- a/mysql-test/t/mysqld--help-win.test +++ b/mysql-test/t/mysqld--help-win.test @@ -1,8 +1,24 @@ +# Copyright (C) 2009-2010 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # # mysqld --help # --source include/not_embedded.inc --source include/windows.inc +--source include/have_perfschema.inc --source include/mysqld--help.inc |