Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.ps


sql/sql_parse.cc:
  Auto merged
tests/client_test.c:
  Auto merged

2 files changed, 59 insertions, 1 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f2458068633..0c178f05cc0 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1493,7 +1493,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
 	thd->query_rest.length(length);
       }
       else
-	thd->query_rest.copy(length);
+	thd->query_rest.copy(packet, length, thd->query_rest.charset());
       break;
 #endif /*EMBEDDED_LIBRARY*/
     }
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 61e5b778b64..68da21018a0 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -309,6 +309,7 @@ void set_param_double(Item_param *param, uchar **pos, ulong len)
   *pos+= 8;
 }
 
+#ifndef EMBEDDED_LIBRARY
 void set_param_time(Item_param *param, uchar **pos, ulong len)
 {
   ulong length;
@@ -386,6 +387,62 @@ void set_param_date(Item_param *param, uchar **pos, ulong len)
   *pos+= length;
 }
 
+#else/*!EMBEDDED_LIBRARY*/
+void set_param_time(Item_param *param, uchar **pos, ulong len)
+{
+  TIME  tm;
+  MYSQL_TIME *to= (MYSQL_TIME*)*pos;
+    
+  tm.second_part= to->second_part;
+
+  tm.day=    to->day;
+  tm.hour=   to->hour;
+  tm.minute= to->minute;
+  tm.second= to->second;
+
+  tm.year= tm.month= 0;
+  tm.neg= to->neg;
+
+  param->set_time(&tm, TIMESTAMP_TIME);
+}
+
+void set_param_datetime(Item_param *param, uchar **pos, ulong len)
+{
+  TIME  tm;
+  MYSQL_TIME *to= (MYSQL_TIME*)*pos;
+
+  tm.second_part= to->second_part;
+
+  tm.day=    to->day;
+  tm.hour=   to->hour;
+  tm.minute= to->minute;
+  tm.second= to->second;
+  tm.year=   to->year;
+  tm.month=  to->month;
+  tm.neg=    0;
+
+  param->set_time(&tm, TIMESTAMP_DATETIME);
+}
+
+void set_param_date(Item_param *param, uchar **pos, ulong len)
+{
+  TIME  tm;
+  MYSQL_TIME *to= (MYSQL_TIME*)*pos;
+    
+  tm.second_part= to->second_part;
+
+  tm.day=    to->day;
+  tm.year=   to->year;
+  tm.month=  to->month;
+  tm.neg=    0;
+  tm.hour= tm.minute= tm.second= 0;
+  tm.second_part= 0;
+  tm.neg= 0;
+
+  param->set_time(&tm, TIMESTAMP_DATE);
+}
+#endif /*!EMBEDDED_LIBRARY*/
+
 void set_param_str(Item_param *param, uchar **pos, ulong len)
 {
   ulong length= get_param_length(pos, len);
@@ -568,6 +625,7 @@ static bool emb_insert_params(Prepared_statement *stmt)
   {
     Item_param *param= *it;
     setup_one_conversion_function(param, client_param->buffer_type);
+    param->unsigned_flag= client_param->is_unsigned;
     if (!param->long_data_supplied)
     {
       if (*client_param->is_null)