#4420 build mysql 5.5.11 with the head of the tree refs[t:4420]

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@39040 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/ha_tokudb.cc

@@ -7622,7 +7622,6 @@ int ha_tokudb::final_drop_index(TABLE *table_arg) {
 }
 
 void ha_tokudb::print_error(int error, myf errflag) {
-    THD* thd = ha_thd();
     if (error == DB_LOCK_DEADLOCK)
         error = HA_ERR_LOCK_DEADLOCK;
     if (error == DB_LOCK_NOTGRANTED)
@@ -7642,9 +7641,12 @@ void ha_tokudb::print_error(int error, myf errflag) {
 #endif
     // TODO: should rename debug code to something better
     // just reusing this so that tests don' start complaining
+#if MYSQL_VERSION_ID < 50500
     if ((tokudb_debug & TOKUDB_DEBUG_HIDE_DDL_LOCK_ERRORS) == 0) {
-      sql_print_error("query \"%s\" returned handler error %d", thd->query_string.str, error);
+        THD* thd = ha_thd();
+        sql_print_error("query \"%s\" returned handler error %d", thd->query_string.str, error);
     }
+#endif
     handler::print_error(error, errflag);
 }
 

storage/tokudb/hatoku_hton.cc

@@ -1149,11 +1149,13 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
 
     ENGINE_STATUS engstat;
 
+#if MYSQL_VERSION_ID < 50500
     {
 	sys_var * version = intern_find_sys_var("version", 0, false);
 	snprintf(buf, bufsiz, "%s", version->value_ptr(thd, (enum_var_type)0, (LEX_STRING*)NULL));
 	STATPRINT("Version", buf);
     }
+#endif
     error = db_env->get_engine_status(db_env, &engstat, buf, bufsiz);
     if (strlen(buf)) {
 	STATPRINT("Environment panic string", buf);