2948 Marc Alff 2009-11-06
Removed noise from unit test output.
added:
storage/perfschema/unittest/stub_print_error.h
modified:
storage/perfschema/unittest/Makefile.am
storage/perfschema/unittest/pfs-t.cc
2947 Marc Alff 2009-11-06 [merge]
Merge mysql-next-mr (revno 2914) --> mysql-trunk-perfschema
removed:
dbug/.cvsignore
dbug/doinstall.sh
dbug/install.sh
dbug/mklintlib.sh
dbug/qmake.cmd
dbug/vargs.h
added:
dbug/remove_function_from_trace.pl
dbug/tests-t.pl
dbug/tests.c
include/mysql/service_my_snprintf.h
include/mysql/service_thd_alloc.h
include/mysql/services.h
include/service_versions.h
libservices/
libservices/CMakeLists.txt
libservices/HOWTO
libservices/Makefile.am
libservices/my_snprintf_service.c
libservices/thd_alloc_service.c
mysql-test/r/partition_column.result
mysql-test/r/partition_column_prune.result
mysql-test/r/partition_utf8.result
mysql-test/t/partition_column.test
mysql-test/t/partition_column_prune.test
mysql-test/t/partition_utf8.test
sql/sql_plugin_services.h
unittest/mysys/my_vsnprintf-t.c
modified:
.bzrignore
BUILD/build_mccge.sh
CMakeLists.txt
Makefile.am
client/mysqltest.cc
configure.in
dbug/Makefile.am
dbug/dbug.c
dbug/dbug_add_tags.pl
dbug/user.r
include/Makefile.am
include/m_string.h
include/my_dbug.h
include/my_global.h
include/my_pthread.h
include/my_sys.h
include/mysql/plugin.h
include/mysql/plugin.h.pp
libmysql/libmysql.c
mysql-test/r/partition.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_error.result
mysql-test/r/partition_innodb.result
mysql-test/r/partition_list.result
mysql-test/r/partition_mgm_err.result
mysql-test/r/partition_pruning.result
mysql-test/r/partition_range.result
mysql-test/r/plugin.result
mysql-test/r/type_decimal.result
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/parts/inc/partition_key_32col.inc
mysql-test/suite/parts/inc/partition_syntax.inc
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/r/partition_special_myisam.result
mysql-test/suite/parts/r/partition_syntax_innodb.result
mysql-test/suite/parts/r/partition_syntax_myisam.result
mysql-test/t/partition.test
mysql-test/t/partition_datatype.test
mysql-test/t/partition_error.test
mysql-test/t/partition_innodb.test
mysql-test/t/partition_list.test
mysql-test/t/partition_mgm_err.test
mysql-test/t/partition_pruning.test
mysql-test/t/partition_range.test
mysql-test/t/plugin.test
mysql-test/t/type_decimal.test
mysys/my_error.c
mysys/my_thr_init.c
plugin/daemon_example/Makefile.am
sql-common/client.c
sql/CMakeLists.txt
sql/Makefile.am
sql/debug_sync.cc
sql/field.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/item_create.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log_event.cc
sql/mysql_priv.h
sql/opt_range.cc
sql/partition_element.h
sql/partition_info.cc
sql/partition_info.h
sql/replication.h
sql/share/errmsg-utf8.txt
sql/share/errmsg.txt
sql/slave.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_partition.cc
sql/sql_partition.h
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_select.cc
sql/sql_show.cc
sql/sql_table.cc
sql/sql_yacc.yy
storage/example/Makefile.am
storage/example/ha_example.cc
storage/mysql_storage_engine.cmake
strings/my_vsnprintf.c
unittest/mysys/Makefile.am
=== modified file 'storage/perfschema/unittest/Makefile.am'
--- a/storage/perfschema/unittest/Makefile.am 2009-09-21 09:35:17 +0000
+++ b/storage/perfschema/unittest/Makefile.am 2009-11-06 17:54:45 +0000
@@ -36,7 +36,7 @@ PROD_CODE = $(top_builddir)/storage/perf
noinst_PROGRAMS = pfs_instr_class-t pfs_instr_class-oom-t \
pfs_instr-t pfs_instr-oom-t pfs_timer-t pfs-t
-pfs_t_SOURCES = pfs-t.cc
+pfs_t_SOURCES = pfs-t.cc stub_print_error.h
pfs_t_LDADD = $(TEST_CODE) $(PROD_CODE)
pfs_instr_class_t_SOURCES = pfs_instr_class-t.cc
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc 2009-11-04 03:11:29 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc 2009-11-06 17:54:45 +0000
@@ -20,6 +20,8 @@
#include <pfs_global.h>
#include <tap.h>
+#include "stub_print_error.h"
+
/* test helpers, to simulate the setup */
void setup_thread(PSI_thread *t, bool enabled)
=== added file 'storage/perfschema/unittest/stub_print_error.h'
--- a/storage/perfschema/unittest/stub_print_error.h 1970-01-01 00:00:00 +0000
+++ b/storage/perfschema/unittest/stub_print_error.h 2009-11-06 17:54:45 +0000
@@ -0,0 +1,40 @@
+/* Copyright (C) 2008-2009 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 */
+
+#include <my_global.h>
+#include <my_sys.h>
+#include <pfs_global.h>
+
+bool pfs_initialized= false;
+
+void *pfs_malloc(size_t size, myf flags)
+{
+ void *ptr= malloc(size);
+ if (ptr && (flags & MY_ZEROFILL))
+ memset(ptr, 0, size);
+ return ptr;
+}
+
+void pfs_free(void *ptr)
+{
+ if (ptr != NULL)
+ free(ptr);
+}
+
+void pfs_print_error(const char *format, ...)
+{
+ /* Do not pollute the unit test output with annoying messages. */
+}
+
Attachment: [text/bzr-bundle] bzr/marc.alff@sun.com-20091106175445-diyad2ukuwx9fk33.bundle
| Thread |
|---|
| • bzr push into mysql-trunk-perfschema branch (marc.alff:2947 to 2948) | Marc Alff | 6 Nov |
