From 6d86790711d1dab56f6c49d4e40d2bd7f2a8b062 Mon Sep 17 00:00:00 2001
From: "tsmith@quadxeon.mysql.com" <>
Date: Tue, 5 Jun 2007 23:56:02 +0200
Subject: [PATCH] sql_prepare.cc:   Post-merge fix (byte -> uchar)

---
 sql/sql_prepare.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index bc9db5862b8..716ca08beb1 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -993,7 +993,7 @@ static bool insert_params_from_vars_with_log(Prepared_statement *stmt,
     Item_param *param= *it;
     varname= var_it++;
 
-    entry= (user_var_entry *) hash_search(&thd->user_vars, (byte*) varname->str,
+    entry= (user_var_entry *) hash_search(&thd->user_vars, (uchar*) varname->str,
                                           varname->length);
     /*
       We have to call the setup_one_conversion_function() here to set