Support for character set conversion in binary protocol: another go

after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first.

2 files changed, 5 insertions, 5 deletions

diff --git a/isam/_search.c b/isam/_search.c
index 7b61abfb46b..fbffd6786e1 100644
--- a/isam/_search.c
+++ b/isam/_search.c
@@ -489,7 +489,7 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar
 	int alength,blength;
 
 	if (swap_flag)
-	  swap(uchar*,a,b);
+	  swap_variables(uchar*, a, b);
 	alength= *a++; blength= *b++;
 	if ((flag=(int) (keyseg->base.length-key_length)) < 0)
 	  flag=0;
@@ -504,7 +504,7 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar
 	if (*a == '-' && *b == '-')
 	{
 	  swap_flag=1;
-	  swap(uchar*,a,b);
+	  swap_variables(uchar*, a, b);
 	}
 	end=a+alength;
 	while (a < end)
@@ -531,7 +531,7 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar
 	if (swap_flag)
 	{
 	  end=b+(int) (end-a);
-	  swap(uchar*,a,b);
+	  swap_variables(uchar*, a, b);
 	}
 	while (a < end)
 	  if (*a++ != *b++)
@@ -550,7 +550,7 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar
 	  }
       }
       if (swap_flag)
-	swap(uchar*,a,b);
+	swap_variables(uchar*, a, b);
       break;
     }
 #ifdef HAVE_LONG_LONG
diff --git a/isam/test2.c b/isam/test2.c
index 14a40f39865..4b22f2d679c 100644
--- a/isam/test2.c
+++ b/isam/test2.c
@@ -526,7 +526,7 @@ int main(int argc, char *argv[])
     if (j != 0 && k != 0)
     {
       if (j > k)
-	swap(int,j,k);
+	swap_variables(int, j, k);
       sprintf(key,"%6d",j);
       sprintf(key2,"%6d",k);
       range_records=nisam_records_in_range(file,0,key,0,HA_READ_AFTER_KEY,