--- options.c.orig	2009-08-10 17:21:57.000000000 +0900
+++ options.c	2010-02-25 16:40:03.000000000 +0900
@@ -12,6 +12,8 @@
   OPT_HELP = 'h',
   OPT_PORT = 'p',
   OPT_SERVER = 's',
+  OPT_USER = 'u',
+  OPT_PASSWORD,
   OPT_CREATE_QUERY,
   OPT_INSERT_TMPL,
   OPT_NUM_ROWS,
@@ -32,6 +34,8 @@
   {"db", required_argument, NULL, OPT_USE_DB},
   {"port", required_argument, NULL, OPT_PORT},
   {"server", required_argument, NULL, OPT_SERVER},
+  {"user", required_argument, NULL, OPT_USER},
+  {"password", required_argument, NULL, OPT_PASSWORD},
   {"load-file", required_argument, NULL, OPT_LOAD_FILE},
   {"read-file", required_argument, NULL, OPT_READ_FILE},
   {"runs", required_argument, NULL, OPT_NUM_RUNS},
@@ -51,6 +55,11 @@
     rv = false;
   }

+  if (share->user == NULL && share->password)
+    share->user = "";
+  else if (share->password == NULL && share->user)
+    share->password = "";
+
   /* skyload does not allow any write operations on the user
      supplied database. this policy is placed to avoid undesired
      updates on the database */
@@ -119,7 +128,7 @@
   assert(share);
   int ch, temp;

-  while ((ch = getopt_long(argc, argv, "hs:p:", longopts, NULL)) != -1) {
+  while ((ch = getopt_long(argc, argv, "hs:p:u", longopts, NULL)) != -1) {
     switch(ch) {
     case OPT_HELP:
       usage();
@@ -130,6 +139,18 @@
         return false;
       }
       break;
+    case OPT_USER:
+      if ((share->user = strdup(optarg)) == NULL) {
+        report_error("out of memory");
+        return false;
+      }
+      break;
+    case OPT_PASSWORD:
+      if ((share->password = strdup(optarg)) == NULL) {
+        report_error("out of memory");
+        return false;
+      }
+      break;
     case OPT_CREATE_QUERY:
       if ((share->create_query = strdup(optarg)) == NULL) {
         report_error("out of memory");
--- skyload.h.orig	2009-08-10 17:21:57.000000000 +0900
+++ skyload.h	2010-02-25 16:40:33.000000000 +0900
@@ -59,6 +59,8 @@
   SKY_LIST *read_queries; /* Singly linked list for external read queries */
   in_port_t port;         /* DBMS port to talk to */
   char *server;           /* DBMS Hostname */
+  char *user;             /* DBMS user name */
+  char *password;         /* DBMS password */
   char *database_name;    /* User specified database to run tests on */
   char *create_query;     /* CREATE TABLE query */
   char *insert_tmpl;      /* INSERT query template */
--- utils.c.orig	2009-08-10 17:21:57.000000000 +0900
+++ utils.c	2010-02-25 16:40:45.000000000 +0900
@@ -161,6 +161,8 @@
     return false;

   drizzle_con_set_tcp(conn, share->server, share->port);
+  if (share->user)
+    drizzle_con_set_auth(conn, share->user, share->password);
   drizzle_con_add_options(conn, share->protocol);
   return true;
 }
@@ -419,6 +421,8 @@
   printf("[ Server Related Options ]\n");
   printf("  --server=      : Server Hostname (required)\n");
   printf("  --port=        : Server Port\n");
+  printf("  --user=        : User name\n");
+  printf("  --password=    : Password\n");
   printf("  --mysql        : Use MySQL Protocol\n");
   printf("\n");
   printf("[ Table and Data Load Options ]\n");