Fixes for prior commit

mysys/my_getsystime.c

@@ -47,6 +47,8 @@ ulonglong my_getsystime()
     offset=li.QuadPart-OFFSET_TO_EPOC;
     QueryPerformanceFrequency(&li);
     freq=li.QuadPart;
+    QueryPerformanceCounter(&t_cnt);
+    offset-=t_cnt.QuadPart/freq*10000000+t_cnt.QuadPart%freq*10000000/freq;
   }
   QueryPerformanceCounter(&t_cnt);
   return t_cnt.QuadPart/freq*10000000+t_cnt.QuadPart%freq*10000000/freq+offset;

sql/sql_prepare.cc

@@ -1005,7 +1005,7 @@ error:
   RETURN VALUE
     0   success
     1   error, sent to client
-   -1   error, not sent to client    
+   -1   error, not sent to client
 */
 static int select_like_statement_test(Prepared_statement *stmt,
 				      TABLE_LIST *tables)
@@ -1147,11 +1147,11 @@ static int mysql_test_insert_select(Prepared_statement *stmt,
   TABLE_LIST *first_local_table=
     (TABLE_LIST *)lex->select_lex.table_list.first;
   /* Skip first table, which is the table we are inserting in */
-  lex->select_lex.table_list.first= (uchar*) first_local_table->next;
+  lex->select_lex.table_list.first= (byte*) first_local_table->next;
   lex->select_lex.resolve_mode= SELECT_LEX::NOMATTER_MODE;
   res= select_like_statement_test(stmt, tables);
   /* revert changes*/
-  lex->select_lex.table_list.first= (uchar*) first_local_table;
+  lex->select_lex.table_list.first= (byte*) first_local_table;
   lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
   return res;
 }