database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge mysql-next-mr --> mysql-5.1-rpl-merge

Browse Source 
Conflicts:
  Text conflict in sql/sql_insert.cc
This commit is contained in:
Alfranio Correia
2010-01-14 16:02:55 +00:00
parent 18a8f3c8cc a6165accb3
commit b4c0c1550c
286 changed files with 27080 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/bug46080-master.opt
View File

@ -1 +1 @@
--skip-grant-tables --skip-name-resolve --loose-safemalloc-mem-limit=4000000
--loose-performance-schema=0 --skip-grant-tables --skip-name-resolve --loose-safemalloc-mem-limit=4000000

16
mysql-test/t/mysqld--help-notwin.test
View File

@ -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/not_windows.inc
--source include/have_perfschema.inc
--source include/mysqld--help.inc

16
mysql-test/t/mysqld--help-win.test
View File

@ -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