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

[marko.makela]

 3461 Marko Mäkelä	2011-11-08
      Correct the @return comment of pars_get_lex_chars().

    modified:
      storage/innobase/include/pars0pars.h
      storage/innobase/pars/pars0pars.cc
 3460 Marko Mäkelä	2011-11-08
      eval_func(): Replace if-else with switch.

    modified:
      storage/innobase/eval/eval0eval.cc
=== modified file 'storage/innobase/include/pars0pars.h'
--- a/storage/innobase/include/pars0pars.h	revid:marko.makela@stripped20111108141427-0s9sy4aeduwdtl9g
+++ b/storage/innobase/include/pars0pars.h	revid:marko.makela@stripped42940-v5cqgei4y0v39g20
@@ -106,7 +106,7 @@ pars_sql(
 	const char*	str);	/*!< in: SQL string */
 /*************************************************************//**
 Retrieves characters to the lexical analyzer.
-@return number of characters copied or EOF */
+@return number of characters copied or 0 on EOF */
 UNIV_INTERN
 int
 pars_get_lex_chars(

=== modified file 'storage/innobase/pars/pars0pars.cc'
--- a/storage/innobase/pars/pars0pars.cc	revid:marko.makela@stripped
+++ b/storage/innobase/pars/pars0pars.cc	revid:[e-mail]-20111108142940-v5cqgei4y0v39g20
@@ -1804,7 +1804,7 @@ pars_stored_procedure_call(
 
 /*************************************************************//**
 Retrieves characters to the lexical analyzer.
-@return number of characters copied or EOF */
+@return number of characters copied or 0 on EOF */
 UNIV_INTERN
 int
 pars_get_lex_chars(

No bundle (reason: useless for push emails).