bzr push into mysql-trunk branch (marko.makela:3458 to 3460)

[marko.makela]

 3460 Marko Mäkelä	2011-11-08
      eval_func(): Replace if-else with switch.

    modified:
      storage/innobase/eval/eval0eval.cc
 3459 Marko Mäkelä	2011-11-08
      Add white space around UINT64PF according to our convention.

    modified:
      storage/innobase/os/os0file.cc
 3458 Marko Mäkelä	2011-11-08
      Update copyright messages.

    modified:
      storage/innobase/log/log0log.cc
      storage/innobase/log/log0recv.cc
      storage/innobase/mem/mem0dbg.cc
      storage/innobase/mem/mem0pool.cc
      storage/innobase/os/os0file.cc
      storage/innobase/os/os0proc.cc
      storage/innobase/os/os0sync.cc
      storage/innobase/os/os0thread.cc
      storage/innobase/pars/lexyy.cc
      storage/innobase/pars/pars0grm.y
      storage/innobase/pars/pars0lex.l
      storage/innobase/pars/pars0opt.cc
      storage/innobase/pars/pars0sym.cc
      storage/innobase/row/row0ext.cc
      storage/innobase/row/row0undo.cc
      storage/innobase/srv/srv0mon.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/usr/usr0sess.cc
      storage/innobase/ut/ut0list.cc
      storage/innobase/ut/ut0vec.cc
      storage/innobase/ut/ut0wqueue.cc
=== modified file 'storage/innobase/eval/eval0eval.cc'
--- a/storage/innobase/eval/eval0eval.cc	revid:marko.makela@stripped6-9ak6nmaodkly6oct
+++ b/storage/innobase/eval/eval0eval.cc	revid:marko.makela@strippeduwdtl9g
@@ -814,34 +814,47 @@ eval_func(
 		arg = que_node_get_next(arg);
 	}
 
-	if (fclass == PARS_FUNC_CMP) {
+	switch (fclass) {
+	case PARS_FUNC_CMP:
 		eval_cmp(func_node);
-	} else if (fclass == PARS_FUNC_ARITH) {
+		return;
+	case PARS_FUNC_ARITH:
 		eval_arith(func_node);
-	} else if (fclass == PARS_FUNC_AGGREGATE) {
+		return;
+	case PARS_FUNC_AGGREGATE:
 		eval_aggregate(func_node);
-	} else if (fclass == PARS_FUNC_PREDEFINED) {
-
-		if (func == PARS_NOTFOUND_TOKEN) {
+		return;
+	case PARS_FUNC_PREDEFINED:
+		switch (func) {
+		case PARS_NOTFOUND_TOKEN:
 			eval_notfound(func_node);
-		} else if (func == PARS_SUBSTR_TOKEN) {
+			return;
+		case PARS_SUBSTR_TOKEN:
 			eval_substr(func_node);
-		} else if (func == PARS_REPLSTR_TOKEN) {
+			return;
+		case PARS_REPLSTR_TOKEN:
 			eval_replstr(func_node);
-		} else if (func == PARS_INSTR_TOKEN) {
+			return;
+		case PARS_INSTR_TOKEN:
 			eval_instr(func_node);
-		} else if (func == PARS_BINARY_TO_NUMBER_TOKEN) {
+			return;
+		case PARS_BINARY_TO_NUMBER_TOKEN:
 			eval_binary_to_number(func_node);
-		} else if (func == PARS_CONCAT_TOKEN) {
+			return;
+		case PARS_CONCAT_TOKEN:
 			eval_concat(func_node);
-		} else if (func == PARS_TO_BINARY_TOKEN) {
+			return;
+		case PARS_TO_BINARY_TOKEN:
 			eval_to_binary(func_node);
-		} else {
+			return;
+		default:
 			eval_predefined(func_node);
+			return;
 		}
-	} else {
-		ut_ad(fclass == PARS_FUNC_LOGICAL);
-
+	case PARS_FUNC_LOGICAL:
 		eval_logical(func_node);
+		return;
 	}
+
+	ut_error;
 }

=== modified file 'storage/innobase/os/os0file.cc'
--- a/storage/innobase/os/os0file.cc	revid:marko.makela@stripped2756-9ak6nmaodkly6oct
+++ b/storage/innobase/os/os0file.cc	revid:marko.makela@strippedwdtl9g
@@ -4897,8 +4897,8 @@ consecutive_loop:
 
 	if (os_aio_print_debug) {
 		fprintf(stderr,
-			"InnoDB: doing i/o of type %lu at offset "UINT64PF","
-			" length %lu\n",
+			"InnoDB: doing i/o of type %lu at offset " UINT64PF
+			", length %lu\n",
 			(ulong) slot->type, slot->offset, (ulong) total_len);
 	}
 

No bundle (reason: useless for push emails).