Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1

tests/client_test.c

@@ -7962,7 +7962,7 @@ static void test_bug1500()
   MYSQL_BIND bind[3];
   int        rc;
   long       int_data[3]= {2,3,4}; 
-  char       *data;
+  const char *data;
 
   myheader("test_bug1500");
 
@@ -8021,7 +8021,7 @@ static void test_bug1500()
   
   data= "Dogs";
   bind[0].buffer_type= MYSQL_TYPE_STRING;
-  bind[0].buffer= data;
+  bind[0].buffer= (char *) data;
   bind[0].buffer_length= strlen(data);
   bind[0].is_null= 0;
   bind[0].length= 0;
@@ -8049,7 +8049,7 @@ static void test_bug1500()
   
   data= "Grave";
   bind[0].buffer_type= MYSQL_TYPE_STRING;
-  bind[0].buffer= data;
+  bind[0].buffer= (char *) data;
   bind[0].buffer_length= strlen(data);
   bind[0].is_null= 0;
   bind[0].length= 0;
@@ -8234,8 +8234,6 @@ int main(int argc, char **argv)
     /* Used for internal new development debugging */
     test_drop_temp();       /* to test DROP TEMPORARY TABLE Access checks */
 #endif
-    test_bug1946(); /* test that placeholders are allowed only in 
-                               prepared queries */
     test_fetch_seek();      /* to test stmt seek() functions */
     test_fetch_nobuffs();   /* to fecth without prior bound buffers */
     test_open_direct();     /* direct execution in the middle of open stmts */
@@ -8335,6 +8333,8 @@ int main(int argc, char **argv)
     test_bug1180();         /* BUG#1180 */
     test_bug1500();         /* BUG#1500 */
     test_bug1644();	    /* BUG#1644 */
+    test_bug1946();         /* test that placeholders are allowed only in 
+                               prepared queries */
 
     end_time= time((time_t *)0);
     total_time+= difftime(end_time, start_time);