← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Eric Day
  • Date: 2010-01-07 20:02:38 UTC
  • mfrom: (1259.4.2 staging)
  • mto: This revision was merged to the branch mainline in revision 1271.
  • Revision ID: eday@oddments.org-20100107200238-uqw8v6kv9pl7nny5
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
50
50
#ifdef HAVE_SYS_WAIT_H
51
51
#include <sys/wait.h>
52
52
#endif
 
53
#include <cassert>
 
54
#include <sys/stat.h>
 
55
#include <sys/types.h>
 
56
#include <fcntl.h>
53
57
 
54
58
#include PCRE_HEADER
55
59
 
60
64
/* Added this for string translation. */
61
65
#include "drizzled/gettext.h"
62
66
#include "drizzled/hash.h"
 
67
#include "drizzled/my_time.h"
 
68
#include "drizzled/charset.h"
63
69
 
64
70
#ifndef DRIZZLE_RETURN_SERVER_GONE
65
71
#define DRIZZLE_RETURN_HANDSHAKE_FAILED DRIZZLE_RETURN_ERROR_CODE
1335
1341
 
1336
1342
*/
1337
1343
 
1338
 
static int compare_files2(File fd, const char* filename2)
 
1344
static int compare_files2(int fd, const char* filename2)
1339
1345
{
1340
1346
  int error= RESULT_OK;
1341
 
  File fd2;
 
1347
  int fd2;
1342
1348
  uint32_t len, len2;
1343
1349
  char buff[512], buff2[512];
1344
1350
  const char *fname= filename2;
1413
1419
 
1414
1420
static int compare_files(const char* filename1, const char* filename2)
1415
1421
{
1416
 
  File fd;
 
1422
  int fd;
1417
1423
  int error;
1418
1424
 
1419
1425
  if ((fd= my_open(filename1, O_RDONLY, MYF(0))) < 0)
1442
1448
static int string_cmp(string* ds, const char *fname)
1443
1449
{
1444
1450
  int error;
1445
 
  File fd;
 
1451
  int fd;
1446
1452
  char temp_file_path[FN_REFLEN];
1447
1453
 
1448
1454
  if ((fd= create_temp_file(temp_file_path, NULL,
2961
2967
static void do_perl(struct st_command *command)
2962
2968
{
2963
2969
  int error;
2964
 
  File fd;
 
2970
  int fd;
2965
2971
  FILE *res_file;
2966
2972
  char buf[FN_REFLEN];
2967
2973
  char temp_file_path[FN_REFLEN];