From: vasil.dimov
Date: October 5 2010 6:45am
Subject: bzr commit into mysql-next-mr-persistent-stats branch (vasil.dimov:3293)
List-Archive: http://lists.mysql.com/commits/119936
Message-Id: <20101005064600.D829C2E0AB@mail.v5d.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6622124381665577416=="

--===============6622124381665577416==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///usr/local/devel/bzrroot/server/mysql-next-mr-persistent-stats/ based on revid:vasil.dimov@stripped

 3293 Vasil Dimov	2010-10-05
      Do not set the error message if DB_TABLE_NOT_FOUND
      
      Since we are not using the message in the case of DB_TABLE_NOT_FOUND
      we change the function not to print to the string then. This is an
      optimizatoin since it is called for each dict_table_get().
      
      Suggested by:	Jimmy (rb://373)

    modified:
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0stats.c
      storage/innobase/include/dict0dict.h
=== modified file 'storage/innobase/dict/dict0dict.c'
--- a/storage/innobase/dict/dict0dict.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/dict/dict0dict.c	revid:vasil.dimov@stripped
@@ -4819,7 +4819,8 @@ dict_table_schema_check(
 	dict_table_schema_t*	req_schema,	/*!< in/out: required table
 						schema */
 	char*			errstr,		/*!< out: human readable error
-						message if != DB_SUCCESS is
+						message if != DB_SUCCESS and
+						!= DB_TABLE_NOT_FOUND is
 						returned */
 	size_t			errstr_sz)	/*!< in: errstr size */
 {
@@ -4833,10 +4834,6 @@ dict_table_schema_check(
 	if (table == NULL || table->ibd_file_missing) {
 		/* no such table or missing tablespace */
 
-		ut_snprintf(errstr, errstr_sz,
-			    "%s does not exist or its tablespace is missing.",
-			    req_schema->table_name);
-
 		return(DB_TABLE_NOT_FOUND);
 	}
 

=== modified file 'storage/innobase/dict/dict0stats.c'
--- a/storage/innobase/dict/dict0stats.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/dict/dict0stats.c	revid:vasil.dimov@stripped
@@ -2640,6 +2640,8 @@ test_dict_table_schema_check()
 	};
 	char	errstr[512];
 
+	ut_snprintf(errstr, sizeof(errstr), "Table not found");
+
 	/* prevent any data dictionary modifications while we are checking
 	the tables' structure */
 

=== modified file 'storage/innobase/include/dict0dict.h'
--- a/storage/innobase/include/dict0dict.h	revid:vasil.dimov@stripped
+++ b/storage/innobase/include/dict0dict.h	revid:vasil.dimov@stripped
@@ -1221,7 +1221,8 @@ dict_table_schema_check(
 	dict_table_schema_t*	req_schema,	/*!< in/out: required table
 						schema */
 	char*			errstr,		/*!< out: human readable error
-						message if != DB_SUCCESS is
+						message if != DB_SUCCESS and
+						!= DB_TABLE_NOT_FOUND is
 						returned */
 	size_t			errstr_sz);	/*!< in: errstr size */
 /* @} */


--===============6622124381665577416==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/vasil.dimov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vasil.dimov@stripped
# target_branch: file:///usr/local/devel/bzrroot/server/mysql-next-mr-\
#   persistent-stats/
# testament_sha1: 295f55ce37df7408680735839f80562716cdc140
# timestamp: 2010-10-05 09:46:00 +0300
# source_branch: file:///usr/local/devel/bzrroot/server/mysql-next-mr-\
#   innodb-persistent-stats/
# base_revision_id: vasil.dimov@stripped\
#   y0zorig5qhxwy34j
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXaiZtwAAx5fgFAwcmf//38V
jwC////wUAWseR1KGtnHdmnVydrcJJFMhqn6U/VPxNSfp6RonqZkKDNNRp5QANAklMRo0aNE1PVP
KaZqaDQ0A0AaDQAkSaIiZNpqap+mamg1T1MnihgaQGNT0RhzAJgJkYARiYmEwmCGmJpgJJJk0Kba
mqPwkn5U8k9PRQAxB6ho0/UmgUPAMQVt4FKhdRVlst/EjOX1ibxbylxZQt12waVAzIIuXZaJrdSX
Px44/udd//9SxXam222jN/Qec3M5sNOFyqGFoI3RdfBDX17jWM+fDh4n+dlIOn6QE+W/bIS+gvml
zyT7MoJlSwrXhaRUmnzs6Kncdxx7Xxx6oHUFGPMmy23YpEJOQbApKRydkQJVX+y/hNFLxHeAZmiX
jS44FaWNmsQ2/nl0PpRZR5KYLctiA5kBMu/I9e9Rn03qUGGuEQyH6N0baCCr9I0kwDelFqGOIMbS
VktiSsUvzotK6zrPLYKRF79iVFrROAcrXVQQeLSXP4U3mnSImaTZK9XRq6ofPV4KV5eiQdso5yLt
fclVthPqcVDGOXHZUTJTOBZvNW3lUyoa/DeIIJyHWudMpzGMFGOwrKTSa52vOjVK6kBaHOwzdaRa
YF8eblzEQpJis1m8RRiBHx12iHD4Xlg3MiWooF5W2untolurJZkZvS8xDK6jt/MxrlmtNNhQ1o4D
WxuTkEQIubd/RlqhxZEiHIlF16WZcjcY4uFckrE5FvEW6+dOBnJxJJ3KTKoFpiUcRGtSy6kf4zpG
zpLdMyiNcyy6sgIbOMvFRJo66IgQNuiZIwSvHXakD1iKroD4CNEnER+GCMyN9hUXRVSTFN6W9Frt
6gPPDGYYeSqeSca8RxcXUmwmHhEqJVWxMdR0iIOpuSqqkxSexN4yW83mUSPJkWqMA6KOjFX7snOZ
02rogJIQ7OQuFa56kpS7/aG74B4dOjeiIbaj9E2XFZ2Jb0BoFCrZkw31D4i7e8+5oFqXppeaB4BJ
I7uIVA8Kg0D8FY8sGD9BhZOTBZaFASingMzGhhd/XEBZsEPAcbLUuJeZdBgnnLcT5sfXyQDvfkOd
CIhdOVSksiYq5OzIMf74IDiqZAsjShOd5KQJs5Zz1DkrOb8hp2dnxvSGROlPuj9BQg6zAwHpSMkr
UuU/mpR3NY6pkA5cSiAxgCHringc3GDtVsSyLImJS5slbQlgsL9VUu8JEzaxjk1PcGdAen5ed7Nv
TdAtc+7Q+KLSowR1p0kdY8jdqqEY9bHTWSGC3q5P3udMEwu2FOOKmU3FG2iduzbDK1tu2ox4ZMvM
mRtYz5afc4nPwFvra4TUtShWqDr0rCsgbajgW3vHRGhLWGYP4tS9aoZdrMziJFyHMlV4+fHDOwxY
A1aJW8MBGREyXdEWk2kEe2ZJoWp4TokIL0EF/e2dAR8zR+fUuwVj9S8/lwhKcVQcOAnvwHBXgIvR
99UEmnESQFARSZC7UyA2hIUnBOPXHUgHJzKHoEcMGzfFbQBhqVBfs5zLkNzuaQWkMaxSasepouVC
WtEDgU3wpiUqhhW5DabQ1+ORx4EJfthGa+usQZkv1uNnJHggIigh690y3Ba+9IK72TIcF0KLp6Iw
+XvRhk855Fd6ekiHCcRVdWEeihFVhabx6fCGEQYaEEmWyKlQaiITdPBg1vUBA/W4V8E+KOl3gkLz
rkjNoFnM8aNVXZ7n0BSn2dElaFQWE8utEs16BcY1CtlOZuvrK7hRTJq0nKxnIx0kvL3jCKV0ux/W
IZAVi5HIGTvbrWxKndgiYDgjp1rJHJGfrhmYwFJsRuNp/xdyRThQkHaiZtw=


--===============6622124381665577416==--