bzr push into mysql-trunk branch (vasil.dimov:3920 to 3921)

[vasil.dimov]

 3921 Vasil Dimov	2012-06-28
      Increment InnoDB version from 1.2.x to 1.3.x since
      MySQL version went from 5.6.x to 5.7.x.

    modified:
      storage/innobase/include/univ.i
 3920 Nisha Gopalakrishnan	2012-06-28
      Bug#13864485: BAD ERROR MESSAGE WITH STORED FUNCTIONS IF NO
                    DEFAULT DATABASE
      
      Analysis:
      --------
      
      When no default database is selected, the error reported for the
      execution of stored function is incorrect. Error ER_SP_DOES_NOT_EXIST
      is reported instead of ER_NO_DB_ERROR.
      
      Fix
      ---
      Changed the error message reported from ER_SP_DOES_NOT_EXIST(Stored
      procedure does not exist) to ER_NO_DB_ERROR(No database selected)
      when a stored function is invoked without a default database set.
      In addition removed the sphead NULL check since the scenario where
      the sphead is valid and the database selected is NULL is invalid for
      stored functions.

    modified:
      mysql-test/r/sp-error.result
      mysql-test/t/sp-error.test
      sql/item_create.cc
=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:nisha.gopalakrishnan@stripped
+++ b/storage/innobase/include/univ.i	revid:vasil.dimov@stripped
@@ -43,7 +43,7 @@ Created 1/20/1994 Heikki Tuuri
 #define IB_TO_STR(s)	_IB_TO_STR(s)
 
 #define INNODB_VERSION_MAJOR	1
-#define INNODB_VERSION_MINOR	2
+#define INNODB_VERSION_MINOR	3
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 /* The following is the InnoDB version as shown in

No bundle (reason: useless for push emails).