Merge lp:~stewart/percona-playback/remove-null-deref into lp:~percona-dev/percona-playback/light
- remove-null-deref
- Merge into light
Proposed by
Stewart Smith
Status: | Merged |
---|---|
Merged at revision: | 120 |
Proposed branch: | lp:~stewart/percona-playback/remove-null-deref |
Merge into: | lp:~percona-dev/percona-playback/light |
Diff against target: |
480 lines (+399/-59) 2 files modified
Makefile (+399/-57) src/long_string.cc (+0/-2) |
To merge this branch: | bzr merge lp:~stewart/percona-playback/remove-null-deref |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Percona developers | Pending | ||
Review via email: mp+67500@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' |
2 | --- Makefile 2011-05-04 15:09:47 +0000 |
3 | +++ Makefile 2011-07-11 07:26:03 +0000 |
4 | @@ -1,57 +1,399 @@ |
5 | -WITH_GPROF ?= 0 |
6 | -CMAKE=cmake -DWITH_GPROF=$(WITH_GPROF) -G "Unix Makefiles" |
7 | -all: test |
8 | - |
9 | -generate: generate_release generate_debug |
10 | - |
11 | -build: build_release build_debug |
12 | - |
13 | -test: build |
14 | - $(MAKE) test_release |
15 | - $(MAKE) test_debug |
16 | - |
17 | -clean: clean_release clean_debug |
18 | - @rm -rf bin/ |
19 | - |
20 | -generate_release: |
21 | - @echo "Generating release Makefile" |
22 | - @mkdir -p release |
23 | - @(cd release; $(CMAKE) -DCMAKE_BUILD_TYPE=Release ../) |
24 | -generate_debug: |
25 | - @echo "Generating debug Makefile" |
26 | - @mkdir -p debug |
27 | - @(cd debug; $(CMAKE) -DCMAKE_BUILD_TYPE=Debug ../) |
28 | - |
29 | -build_release: generate_release |
30 | - @echo "Building release" |
31 | - @(cd release; $(MAKE)) |
32 | - mkdir -p bin |
33 | - rm -f bin/ppb.release |
34 | - cp release/src/ppb bin/ppb.release |
35 | - |
36 | -build_debug: generate_debug |
37 | - @echo "Building debug" |
38 | - @(cd debug; $(MAKE)) |
39 | - mkdir -p bin |
40 | - rm -f bin/ppb.debug |
41 | - cp debug/src/ppb bin/ppb.debug |
42 | - |
43 | -test_release: build_release |
44 | - @echo "Testing release" |
45 | - @(cd release; $(MAKE) test-bt) |
46 | - |
47 | -test_debug: build_debug |
48 | - @echo "Testing debug" |
49 | - @(cd debug; $(MAKE) test-bt) |
50 | - |
51 | -clean_release: |
52 | - @echo "Cleaning release" |
53 | - @rm -rf release |
54 | - @rm -f bin/ppb.release |
55 | - |
56 | -clean_debug: |
57 | - @echo "Cleaning debug" |
58 | - @rm -rf debug |
59 | - @rm -f bin/ppb.debug |
60 | - |
61 | -.DEFAULT_GOAL := build |
62 | +# CMAKE generated file: DO NOT EDIT! |
63 | +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 |
64 | + |
65 | +# Default target executed when no arguments are given to make. |
66 | +default_target: all |
67 | +.PHONY : default_target |
68 | + |
69 | +#============================================================================= |
70 | +# Special targets provided by cmake. |
71 | + |
72 | +# Disable implicit rules so canoncical targets will work. |
73 | +.SUFFIXES: |
74 | + |
75 | +# Remove some rules from gmake that .SUFFIXES does not remove. |
76 | +SUFFIXES = |
77 | + |
78 | +.SUFFIXES: .hpux_make_needs_suffix_list |
79 | + |
80 | +# Suppress display of executed commands. |
81 | +$(VERBOSE).SILENT: |
82 | + |
83 | +# A target that is always out of date. |
84 | +cmake_force: |
85 | +.PHONY : cmake_force |
86 | + |
87 | +#============================================================================= |
88 | +# Set environment variables for the build. |
89 | + |
90 | +# The shell in which to execute make rules. |
91 | +SHELL = /bin/sh |
92 | + |
93 | +# The CMake executable. |
94 | +CMAKE_COMMAND = /usr/bin/cmake |
95 | + |
96 | +# The command to remove a file. |
97 | +RM = /usr/bin/cmake -E remove -f |
98 | + |
99 | +# The top-level source directory on which CMake was run. |
100 | +CMAKE_SOURCE_DIR = /home/stewart/percona-playback |
101 | + |
102 | +# The top-level build directory on which CMake was run. |
103 | +CMAKE_BINARY_DIR = /home/stewart/percona-playback |
104 | + |
105 | +#============================================================================= |
106 | +# Targets provided globally by CMake. |
107 | + |
108 | +# Special rule for the target edit_cache |
109 | +edit_cache: |
110 | + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..." |
111 | + /usr/bin/cmake -i . |
112 | +.PHONY : edit_cache |
113 | + |
114 | +# Special rule for the target edit_cache |
115 | +edit_cache/fast: edit_cache |
116 | +.PHONY : edit_cache/fast |
117 | + |
118 | +# Special rule for the target rebuild_cache |
119 | +rebuild_cache: |
120 | + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." |
121 | + /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) |
122 | +.PHONY : rebuild_cache |
123 | + |
124 | +# Special rule for the target rebuild_cache |
125 | +rebuild_cache/fast: rebuild_cache |
126 | +.PHONY : rebuild_cache/fast |
127 | + |
128 | +# The main all target |
129 | +all: cmake_check_build_system |
130 | + $(CMAKE_COMMAND) -E cmake_progress_start /home/stewart/percona-playback/CMakeFiles /home/stewart/percona-playback/CMakeFiles/progress.marks |
131 | + $(MAKE) -f CMakeFiles/Makefile2 all |
132 | + $(CMAKE_COMMAND) -E cmake_progress_start /home/stewart/percona-playback/CMakeFiles 0 |
133 | +.PHONY : all |
134 | + |
135 | +# The main clean target |
136 | +clean: |
137 | + $(MAKE) -f CMakeFiles/Makefile2 clean |
138 | +.PHONY : clean |
139 | + |
140 | +# The main clean target |
141 | +clean/fast: clean |
142 | +.PHONY : clean/fast |
143 | + |
144 | +# Prepare targets for installation. |
145 | +preinstall: all |
146 | + $(MAKE) -f CMakeFiles/Makefile2 preinstall |
147 | +.PHONY : preinstall |
148 | + |
149 | +# Prepare targets for installation. |
150 | +preinstall/fast: |
151 | + $(MAKE) -f CMakeFiles/Makefile2 preinstall |
152 | +.PHONY : preinstall/fast |
153 | + |
154 | +# clear depends |
155 | +depend: |
156 | + $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 |
157 | +.PHONY : depend |
158 | + |
159 | +#============================================================================= |
160 | +# Target rules for targets named common |
161 | + |
162 | +# Build rule for target. |
163 | +common: cmake_check_build_system |
164 | + $(MAKE) -f CMakeFiles/Makefile2 common |
165 | +.PHONY : common |
166 | + |
167 | +# fast build rule for target. |
168 | +common/fast: |
169 | + $(MAKE) -f src/CMakeFiles/common.dir/build.make src/CMakeFiles/common.dir/build |
170 | +.PHONY : common/fast |
171 | + |
172 | +#============================================================================= |
173 | +# Target rules for targets named ppb |
174 | + |
175 | +# Build rule for target. |
176 | +ppb: cmake_check_build_system |
177 | + $(MAKE) -f CMakeFiles/Makefile2 ppb |
178 | +.PHONY : ppb |
179 | + |
180 | +# fast build rule for target. |
181 | +ppb/fast: |
182 | + $(MAKE) -f src/CMakeFiles/ppb.dir/build.make src/CMakeFiles/ppb.dir/build |
183 | +.PHONY : ppb/fast |
184 | + |
185 | +#============================================================================= |
186 | +# Target rules for targets named test-bt |
187 | + |
188 | +# Build rule for target. |
189 | +test-bt: cmake_check_build_system |
190 | + $(MAKE) -f CMakeFiles/Makefile2 test-bt |
191 | +.PHONY : test-bt |
192 | + |
193 | +# fast build rule for target. |
194 | +test-bt/fast: |
195 | + $(MAKE) -f test/CMakeFiles/test-bt.dir/build.make test/CMakeFiles/test-bt.dir/build |
196 | +.PHONY : test-bt/fast |
197 | + |
198 | +#============================================================================= |
199 | +# Target rules for targets named introspection_complex |
200 | + |
201 | +# Build rule for target. |
202 | +introspection_complex: cmake_check_build_system |
203 | + $(MAKE) -f CMakeFiles/Makefile2 introspection_complex |
204 | +.PHONY : introspection_complex |
205 | + |
206 | +# fast build rule for target. |
207 | +introspection_complex/fast: |
208 | + $(MAKE) -f test/unit/CMakeFiles/introspection_complex.dir/build.make test/unit/CMakeFiles/introspection_complex.dir/build |
209 | +.PHONY : introspection_complex/fast |
210 | + |
211 | +#============================================================================= |
212 | +# Target rules for targets named introspection_integral |
213 | + |
214 | +# Build rule for target. |
215 | +introspection_integral: cmake_check_build_system |
216 | + $(MAKE) -f CMakeFiles/Makefile2 introspection_integral |
217 | +.PHONY : introspection_integral |
218 | + |
219 | +# fast build rule for target. |
220 | +introspection_integral/fast: |
221 | + $(MAKE) -f test/unit/CMakeFiles/introspection_integral.dir/build.make test/unit/CMakeFiles/introspection_integral.dir/build |
222 | +.PHONY : introspection_integral/fast |
223 | + |
224 | +#============================================================================= |
225 | +# Target rules for targets named queue |
226 | + |
227 | +# Build rule for target. |
228 | +queue: cmake_check_build_system |
229 | + $(MAKE) -f CMakeFiles/Makefile2 queue |
230 | +.PHONY : queue |
231 | + |
232 | +# fast build rule for target. |
233 | +queue/fast: |
234 | + $(MAKE) -f test/unit/CMakeFiles/queue.dir/build.make test/unit/CMakeFiles/queue.dir/build |
235 | +.PHONY : queue/fast |
236 | + |
237 | +#============================================================================= |
238 | +# Target rules for targets named file_reader |
239 | + |
240 | +# Build rule for target. |
241 | +file_reader: cmake_check_build_system |
242 | + $(MAKE) -f CMakeFiles/Makefile2 file_reader |
243 | +.PHONY : file_reader |
244 | + |
245 | +# fast build rule for target. |
246 | +file_reader/fast: |
247 | + $(MAKE) -f test/reader/CMakeFiles/file_reader.dir/build.make test/reader/CMakeFiles/file_reader.dir/build |
248 | +.PHONY : file_reader/fast |
249 | + |
250 | +#============================================================================= |
251 | +# Target rules for targets named socket_reader |
252 | + |
253 | +# Build rule for target. |
254 | +socket_reader: cmake_check_build_system |
255 | + $(MAKE) -f CMakeFiles/Makefile2 socket_reader |
256 | +.PHONY : socket_reader |
257 | + |
258 | +# fast build rule for target. |
259 | +socket_reader/fast: |
260 | + $(MAKE) -f test/reader/CMakeFiles/socket_reader.dir/build.make test/reader/CMakeFiles/socket_reader.dir/build |
261 | +.PHONY : socket_reader/fast |
262 | + |
263 | +#============================================================================= |
264 | +# Target rules for targets named stdin |
265 | + |
266 | +# Build rule for target. |
267 | +stdin: cmake_check_build_system |
268 | + $(MAKE) -f CMakeFiles/Makefile2 stdin |
269 | +.PHONY : stdin |
270 | + |
271 | +# fast build rule for target. |
272 | +stdin/fast: |
273 | + $(MAKE) -f test/reader/CMakeFiles/stdin.dir/build.make test/reader/CMakeFiles/stdin.dir/build |
274 | +.PHONY : stdin/fast |
275 | + |
276 | +#============================================================================= |
277 | +# Target rules for targets named add_last |
278 | + |
279 | +# Build rule for target. |
280 | +add_last: cmake_check_build_system |
281 | + $(MAKE) -f CMakeFiles/Makefile2 add_last |
282 | +.PHONY : add_last |
283 | + |
284 | +# fast build rule for target. |
285 | +add_last/fast: |
286 | + $(MAKE) -f test/string/CMakeFiles/add_last.dir/build.make test/string/CMakeFiles/add_last.dir/build |
287 | +.PHONY : add_last/fast |
288 | + |
289 | +#============================================================================= |
290 | +# Target rules for targets named end_of_line |
291 | + |
292 | +# Build rule for target. |
293 | +end_of_line: cmake_check_build_system |
294 | + $(MAKE) -f CMakeFiles/Makefile2 end_of_line |
295 | +.PHONY : end_of_line |
296 | + |
297 | +# fast build rule for target. |
298 | +end_of_line/fast: |
299 | + $(MAKE) -f test/string/CMakeFiles/end_of_line.dir/build.make test/string/CMakeFiles/end_of_line.dir/build |
300 | +.PHONY : end_of_line/fast |
301 | + |
302 | +#============================================================================= |
303 | +# Target rules for targets named query_parse |
304 | + |
305 | +# Build rule for target. |
306 | +query_parse: cmake_check_build_system |
307 | + $(MAKE) -f CMakeFiles/Makefile2 query_parse |
308 | +.PHONY : query_parse |
309 | + |
310 | +# fast build rule for target. |
311 | +query_parse/fast: |
312 | + $(MAKE) -f test/string/CMakeFiles/query_parse.dir/build.make test/string/CMakeFiles/query_parse.dir/build |
313 | +.PHONY : query_parse/fast |
314 | + |
315 | +#============================================================================= |
316 | +# Target rules for targets named remove_first |
317 | + |
318 | +# Build rule for target. |
319 | +remove_first: cmake_check_build_system |
320 | + $(MAKE) -f CMakeFiles/Makefile2 remove_first |
321 | +.PHONY : remove_first |
322 | + |
323 | +# fast build rule for target. |
324 | +remove_first/fast: |
325 | + $(MAKE) -f test/string/CMakeFiles/remove_first.dir/build.make test/string/CMakeFiles/remove_first.dir/build |
326 | +.PHONY : remove_first/fast |
327 | + |
328 | +#============================================================================= |
329 | +# Target rules for targets named trace |
330 | + |
331 | +# Build rule for target. |
332 | +trace: cmake_check_build_system |
333 | + $(MAKE) -f CMakeFiles/Makefile2 trace |
334 | +.PHONY : trace |
335 | + |
336 | +# fast build rule for target. |
337 | +trace/fast: |
338 | + $(MAKE) -f test/parser/CMakeFiles/trace.dir/build.make test/parser/CMakeFiles/trace.dir/build |
339 | +.PHONY : trace/fast |
340 | + |
341 | +#============================================================================= |
342 | +# Target rules for targets named connect_by_network |
343 | + |
344 | +# Build rule for target. |
345 | +connect_by_network: cmake_check_build_system |
346 | + $(MAKE) -f CMakeFiles/Makefile2 connect_by_network |
347 | +.PHONY : connect_by_network |
348 | + |
349 | +# fast build rule for target. |
350 | +connect_by_network/fast: |
351 | + $(MAKE) -f test/mysql_client/CMakeFiles/connect_by_network.dir/build.make test/mysql_client/CMakeFiles/connect_by_network.dir/build |
352 | +.PHONY : connect_by_network/fast |
353 | + |
354 | +#============================================================================= |
355 | +# Target rules for targets named connect_by_network_failed |
356 | + |
357 | +# Build rule for target. |
358 | +connect_by_network_failed: cmake_check_build_system |
359 | + $(MAKE) -f CMakeFiles/Makefile2 connect_by_network_failed |
360 | +.PHONY : connect_by_network_failed |
361 | + |
362 | +# fast build rule for target. |
363 | +connect_by_network_failed/fast: |
364 | + $(MAKE) -f test/mysql_client/CMakeFiles/connect_by_network_failed.dir/build.make test/mysql_client/CMakeFiles/connect_by_network_failed.dir/build |
365 | +.PHONY : connect_by_network_failed/fast |
366 | + |
367 | +#============================================================================= |
368 | +# Target rules for targets named connect_by_socket |
369 | + |
370 | +# Build rule for target. |
371 | +connect_by_socket: cmake_check_build_system |
372 | + $(MAKE) -f CMakeFiles/Makefile2 connect_by_socket |
373 | +.PHONY : connect_by_socket |
374 | + |
375 | +# fast build rule for target. |
376 | +connect_by_socket/fast: |
377 | + $(MAKE) -f test/mysql_client/CMakeFiles/connect_by_socket.dir/build.make test/mysql_client/CMakeFiles/connect_by_socket.dir/build |
378 | +.PHONY : connect_by_socket/fast |
379 | + |
380 | +#============================================================================= |
381 | +# Target rules for targets named connect_by_socket_failed |
382 | + |
383 | +# Build rule for target. |
384 | +connect_by_socket_failed: cmake_check_build_system |
385 | + $(MAKE) -f CMakeFiles/Makefile2 connect_by_socket_failed |
386 | +.PHONY : connect_by_socket_failed |
387 | + |
388 | +# fast build rule for target. |
389 | +connect_by_socket_failed/fast: |
390 | + $(MAKE) -f test/mysql_client/CMakeFiles/connect_by_socket_failed.dir/build.make test/mysql_client/CMakeFiles/connect_by_socket_failed.dir/build |
391 | +.PHONY : connect_by_socket_failed/fast |
392 | + |
393 | +#============================================================================= |
394 | +# Target rules for targets named create_database |
395 | + |
396 | +# Build rule for target. |
397 | +create_database: cmake_check_build_system |
398 | + $(MAKE) -f CMakeFiles/Makefile2 create_database |
399 | +.PHONY : create_database |
400 | + |
401 | +# fast build rule for target. |
402 | +create_database/fast: |
403 | + $(MAKE) -f test/mysql_client/CMakeFiles/create_database.dir/build.make test/mysql_client/CMakeFiles/create_database.dir/build |
404 | +.PHONY : create_database/fast |
405 | + |
406 | +#============================================================================= |
407 | +# Target rules for targets named read_query |
408 | + |
409 | +# Build rule for target. |
410 | +read_query: cmake_check_build_system |
411 | + $(MAKE) -f CMakeFiles/Makefile2 read_query |
412 | +.PHONY : read_query |
413 | + |
414 | +# fast build rule for target. |
415 | +read_query/fast: |
416 | + $(MAKE) -f test/mysql_client/CMakeFiles/read_query.dir/build.make test/mysql_client/CMakeFiles/read_query.dir/build |
417 | +.PHONY : read_query/fast |
418 | + |
419 | +# Help Target |
420 | +help: |
421 | + @echo "The following are some of the valid targets for this Makefile:" |
422 | + @echo "... all (the default if no target is provided)" |
423 | + @echo "... clean" |
424 | + @echo "... depend" |
425 | + @echo "... edit_cache" |
426 | + @echo "... rebuild_cache" |
427 | + @echo "... common" |
428 | + @echo "... ppb" |
429 | + @echo "... test-bt" |
430 | + @echo "... introspection_complex" |
431 | + @echo "... introspection_integral" |
432 | + @echo "... queue" |
433 | + @echo "... file_reader" |
434 | + @echo "... socket_reader" |
435 | + @echo "... stdin" |
436 | + @echo "... add_last" |
437 | + @echo "... end_of_line" |
438 | + @echo "... query_parse" |
439 | + @echo "... remove_first" |
440 | + @echo "... trace" |
441 | + @echo "... connect_by_network" |
442 | + @echo "... connect_by_network_failed" |
443 | + @echo "... connect_by_socket" |
444 | + @echo "... connect_by_socket_failed" |
445 | + @echo "... create_database" |
446 | + @echo "... read_query" |
447 | +.PHONY : help |
448 | + |
449 | + |
450 | + |
451 | +#============================================================================= |
452 | +# Special targets to cleanup operation of make. |
453 | + |
454 | +# Special rule to run CMake to check the build system integrity. |
455 | +# No rule that depends on this can have commands that come from listfiles |
456 | +# because they might be regenerated. |
457 | +cmake_check_build_system: |
458 | + $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 |
459 | +.PHONY : cmake_check_build_system |
460 | + |
461 | |
462 | === modified file 'src/long_string.cc' |
463 | --- src/long_string.cc 2011-06-23 06:11:17 +0000 |
464 | +++ src/long_string.cc 2011-07-11 07:26:03 +0000 |
465 | @@ -353,7 +353,6 @@ |
466 | if (m_null) |
467 | { |
468 | ASSERT(false && "Impossible call method length when Nullable_String is null"); |
469 | - std::cout << *reinterpret_cast<int*>(0); |
470 | throw String_Null_Error("length"); |
471 | } |
472 | else |
473 | @@ -364,7 +363,6 @@ |
474 | if (m_null) |
475 | { |
476 | ASSERT(false && "Impossible call method length when Nullable_String is null"); |
477 | - std::cout << *reinterpret_cast<int*>(0); |
478 | throw String_Null_Error("length"); |
479 | } |
480 | else |