Merge lp:~stewart/percona-playback/remove-null-deref into lp:~percona-dev/percona-playback/light

[Stewart Smith]

=== modified file 'Makefile'
--- Makefile	2011-05-04 15:09:47 +0000
+++ Makefile	2011-07-11 07:26:03 +0000
@@ -1,57 +1,399 @@
-WITH_GPROF ?= 0
-CMAKE=cmake -DWITH_GPROF=$(WITH_GPROF) -G "Unix Makefiles" 
-all: test
-
-generate: generate_release generate_debug
-
-build: build_release build_debug
-
-test: build
-	$(MAKE) test_release
-	$(MAKE) test_debug
-
-clean: clean_release clean_debug
-	@rm -rf bin/
-
-generate_release:
-	@echo "Generating release Makefile"
-	@mkdir -p release
-	@(cd release; $(CMAKE) -DCMAKE_BUILD_TYPE=Release ../)
-generate_debug:
-	@echo "Generating debug Makefile"
-	@mkdir -p debug
-	@(cd debug; $(CMAKE) -DCMAKE_BUILD_TYPE=Debug ../)
-
-build_release: generate_release
-	@echo "Building release"
-	@(cd release; $(MAKE))
-	mkdir -p bin
-	rm -f bin/ppb.release
-	cp release/src/ppb bin/ppb.release
-
-build_debug: generate_debug
-	@echo "Building debug"
-	@(cd debug; $(MAKE))
-	mkdir -p bin
-	rm -f bin/ppb.debug
-	cp debug/src/ppb bin/ppb.debug
-
-test_release: build_release
-	@echo "Testing release"
-	@(cd release; $(MAKE) test-bt)
-
-test_debug: build_debug
-	@echo "Testing debug"
-	@(cd debug; $(MAKE) test-bt)
-
-clean_release:
-	@echo "Cleaning release"
-	@rm -rf release
-	@rm -f bin/ppb.release
-
-clean_debug:
-	@echo "Cleaning debug"
-	@rm -rf debug
-	@rm -f bin/ppb.debug
-
-.DEFAULT_GOAL := build
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
+
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canoncical targets will work.
+.SUFFIXES:
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/stewart/percona-playback
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/stewart/percona-playback
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/stewart/percona-playback/CMakeFiles /home/stewart/percona-playback/CMakeFiles/progress.marks
+	$(MAKE) -f CMakeFiles/Makefile2 all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/stewart/percona-playback/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	$(MAKE) -f CMakeFiles/Makefile2 clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	$(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	$(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+#=============================================================================
+# Target rules for targets named common
+
+# Build rule for target.
+common: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 common
+.PHONY : common
+
+# fast build rule for target.
+common/fast:
+	$(MAKE) -f src/CMakeFiles/common.dir/build.make src/CMakeFiles/common.dir/build
+.PHONY : common/fast
+
+#=============================================================================
+# Target rules for targets named ppb
+
+# Build rule for target.
+ppb: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 ppb
+.PHONY : ppb
+
+# fast build rule for target.
+ppb/fast:
+	$(MAKE) -f src/CMakeFiles/ppb.dir/build.make src/CMakeFiles/ppb.dir/build
+.PHONY : ppb/fast
+
+#=============================================================================
+# Target rules for targets named test-bt
+
+# Build rule for target.
+test-bt: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 test-bt
+.PHONY : test-bt
+
+# fast build rule for target.
+test-bt/fast:
+	$(MAKE) -f test/CMakeFiles/test-bt.dir/build.make test/CMakeFiles/test-bt.dir/build
+.PHONY : test-bt/fast
+
+#=============================================================================
+# Target rules for targets named introspection_complex
+
+# Build rule for target.
+introspection_complex: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 introspection_complex
+.PHONY : introspection_complex
+
+# fast build rule for target.
+introspection_complex/fast:
+	$(MAKE) -f test/unit/CMakeFiles/introspection_complex.dir/build.make test/unit/CMakeFiles/introspection_complex.dir/build
+.PHONY : introspection_complex/fast
+
+#=============================================================================
+# Target rules for targets named introspection_integral
+
+# Build rule for target.
+introspection_integral: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 introspection_integral
+.PHONY : introspection_integral
+
+# fast build rule for target.
+introspection_integral/fast:
+	$(MAKE) -f test/unit/CMakeFiles/introspection_integral.dir/build.make test/unit/CMakeFiles/introspection_integral.dir/build
+.PHONY : introspection_integral/fast
+
+#=============================================================================
+# Target rules for targets named queue
+
+# Build rule for target.
+queue: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 queue
+.PHONY : queue
+
+# fast build rule for target.
+queue/fast:
+	$(MAKE) -f test/unit/CMakeFiles/queue.dir/build.make test/unit/CMakeFiles/queue.dir/build
+.PHONY : queue/fast
+
+#=============================================================================
+# Target rules for targets named file_reader
+
+# Build rule for target.
+file_reader: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 file_reader
+.PHONY : file_reader
+
+# fast build rule for target.
+file_reader/fast:
+	$(MAKE) -f test/reader/CMakeFiles/file_reader.dir/build.make test/reader/CMakeFiles/file_reader.dir/build
+.PHONY : file_reader/fast
+
+#=============================================================================
+# Target rules for targets named socket_reader
+
+# Build rule for target.
+socket_reader: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 socket_reader
+.PHONY : socket_reader
+
+# fast build rule for target.
+socket_reader/fast:
+	$(MAKE) -f test/reader/CMakeFiles/socket_reader.dir/build.make test/reader/CMakeFiles/socket_reader.dir/build
+.PHONY : socket_reader/fast
+
+#=============================================================================
+# Target rules for targets named stdin
+
+# Build rule for target.
+stdin: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 stdin
+.PHONY : stdin
+
+# fast build rule for target.
+stdin/fast:
+	$(MAKE) -f test/reader/CMakeFiles/stdin.dir/build.make test/reader/CMakeFiles/stdin.dir/build
+.PHONY : stdin/fast
+
+#=============================================================================
+# Target rules for targets named add_last
+
+# Build rule for target.
+add_last: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 add_last
+.PHONY : add_last
+
+# fast build rule for target.
+add_last/fast:
+	$(MAKE) -f test/string/CMakeFiles/add_last.dir/build.make test/string/CMakeFiles/add_last.dir/build
+.PHONY : add_last/fast
+
+#=============================================================================
+# Target rules for targets named end_of_line
+
+# Build rule for target.
+end_of_line: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 end_of_line
+.PHONY : end_of_line
+
+# fast build rule for target.
+end_of_line/fast:
+	$(MAKE) -f test/string/CMakeFiles/end_of_line.dir/build.make test/string/CMakeFiles/end_of_line.dir/build
+.PHONY : end_of_line/fast
+
+#=============================================================================
+# Target rules for targets named query_parse
+
+# Build rule for target.
+query_parse: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 query_parse
+.PHONY : query_parse
+
+# fast build rule for target.
+query_parse/fast:
+	$(MAKE) -f test/string/CMakeFiles/query_parse.dir/build.make test/string/CMakeFiles/query_parse.dir/build
+.PHONY : query_parse/fast
+
+#=============================================================================
+# Target rules for targets named remove_first
+
+# Build rule for target.
+remove_first: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 remove_first
+.PHONY : remove_first
+
+# fast build rule for target.
+remove_first/fast:
+	$(MAKE) -f test/string/CMakeFiles/remove_first.dir/build.make test/string/CMakeFiles/remove_first.dir/build
+.PHONY : remove_first/fast
+
+#=============================================================================
+# Target rules for targets named trace
+
+# Build rule for target.
+trace: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 trace
+.PHONY : trace
+
+# fast build rule for target.
+trace/fast:
+	$(MAKE) -f test/parser/CMakeFiles/trace.dir/build.make test/parser/CMakeFiles/trace.dir/build
+.PHONY : trace/fast
+
+#=============================================================================
+# Target rules for targets named connect_by_network
+
+# Build rule for target.
+connect_by_network: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 connect_by_network
+.PHONY : connect_by_network
+
+# fast build rule for target.
+connect_by_network/fast:
+	$(MAKE) -f test/mysql_client/CMakeFiles/connect_by_network.dir/build.make test/mysql_client/CMakeFiles/connect_by_network.dir/build
+.PHONY : connect_by_network/fast
+
+#=============================================================================
+# Target rules for targets named connect_by_network_failed
+
+# Build rule for target.
+connect_by_network_failed: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 connect_by_network_failed
+.PHONY : connect_by_network_failed
+
+# fast build rule for target.
+connect_by_network_failed/fast:
+	$(MAKE) -f test/mysql_client/CMakeFiles/connect_by_network_failed.dir/build.make test/mysql_client/CMakeFiles/connect_by_network_failed.dir/build
+.PHONY : connect_by_network_failed/fast
+
+#=============================================================================
+# Target rules for targets named connect_by_socket
+
+# Build rule for target.
+connect_by_socket: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 connect_by_socket
+.PHONY : connect_by_socket
+
+# fast build rule for target.
+connect_by_socket/fast:
+	$(MAKE) -f test/mysql_client/CMakeFiles/connect_by_socket.dir/build.make test/mysql_client/CMakeFiles/connect_by_socket.dir/build
+.PHONY : connect_by_socket/fast
+
+#=============================================================================
+# Target rules for targets named connect_by_socket_failed
+
+# Build rule for target.
+connect_by_socket_failed: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 connect_by_socket_failed
+.PHONY : connect_by_socket_failed
+
+# fast build rule for target.
+connect_by_socket_failed/fast:
+	$(MAKE) -f test/mysql_client/CMakeFiles/connect_by_socket_failed.dir/build.make test/mysql_client/CMakeFiles/connect_by_socket_failed.dir/build
+.PHONY : connect_by_socket_failed/fast
+
+#=============================================================================
+# Target rules for targets named create_database
+
+# Build rule for target.
+create_database: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 create_database
+.PHONY : create_database
+
+# fast build rule for target.
+create_database/fast:
+	$(MAKE) -f test/mysql_client/CMakeFiles/create_database.dir/build.make test/mysql_client/CMakeFiles/create_database.dir/build
+.PHONY : create_database/fast
+
+#=============================================================================
+# Target rules for targets named read_query
+
+# Build rule for target.
+read_query: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 read_query
+.PHONY : read_query
+
+# fast build rule for target.
+read_query/fast:
+	$(MAKE) -f test/mysql_client/CMakeFiles/read_query.dir/build.make test/mysql_client/CMakeFiles/read_query.dir/build
+.PHONY : read_query/fast
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... edit_cache"
+	@echo "... rebuild_cache"
+	@echo "... common"
+	@echo "... ppb"
+	@echo "... test-bt"
+	@echo "... introspection_complex"
+	@echo "... introspection_integral"
+	@echo "... queue"
+	@echo "... file_reader"
+	@echo "... socket_reader"
+	@echo "... stdin"
+	@echo "... add_last"
+	@echo "... end_of_line"
+	@echo "... query_parse"
+	@echo "... remove_first"
+	@echo "... trace"
+	@echo "... connect_by_network"
+	@echo "... connect_by_network_failed"
+	@echo "... connect_by_socket"
+	@echo "... connect_by_socket_failed"
+	@echo "... create_database"
+	@echo "... read_query"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
 
=== modified file 'src/long_string.cc'
--- src/long_string.cc	2011-06-23 06:11:17 +0000
+++ src/long_string.cc	2011-07-11 07:26:03 +0000
@@ -353,7 +353,6 @@
   if (m_null)
     {
       ASSERT(false && "Impossible call method length when Nullable_String is null");
-      std::cout << *reinterpret_cast<int*>(0);
       throw String_Null_Error("length");
     }
   else
@@ -364,7 +363,6 @@
   if (m_null)
     {
       ASSERT(false && "Impossible call method length when Nullable_String is null");
-      std::cout << *reinterpret_cast<int*>(0);
       throw String_Null_Error("length");
     }
   else