← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Lee Bieber
  • Date: 2011-01-05 19:01:18 UTC
  • mfrom: (2053.2.3 trunk-bug-696188)
  • Revision ID: kalebral@gmail.com-20110105190118-kiq5sez67rvi4kl7
Merge Andrew - fix bug 696188: error handling for drizzle client stdin replacement problems

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
368
368
  com_nopager(string *str, const char*), com_pager(string *str, const char*);
369
369
 
370
370
static int read_and_execute(bool interactive);
371
 
static int sql_connect(const string &host, const string &database, const string &user, const string &password,
372
 
                       uint32_t silent);
 
371
static int sql_connect(const string &host, const string &database, const string &user, const string &password);
373
372
static const char *server_version_string(drizzle_con_st *con);
374
373
static int put_info(const char *str,INFO_TYPE info,uint32_t error,
375
374
                    const char *sql_state);
1490
1489
  if (! isatty(0) || ! isatty(1))
1491
1490
  {
1492
1491
    status.setBatch(1); opt_silent=1;
1493
 
    ignore_errors=0;
1494
1492
  }
1495
1493
  else
1496
1494
    status.setAddToHistory(1);
1667
1665
  }
1668
1666
  if (vm.count("silent"))
1669
1667
  {
1670
 
    opt_silent++;
 
1668
    opt_silent= 2;
1671
1669
  }
1672
1670
  
1673
1671
  if (vm.count("help") || vm.count("version"))
1695
1693
  }
1696
1694
 
1697
1695
  memset(&drizzle, 0, sizeof(drizzle));
1698
 
  if (sql_connect(current_host, current_db, current_user, opt_password,opt_silent))
 
1696
  if (sql_connect(current_host, current_db, current_user, opt_password))
1699
1697
  {
1700
1698
    quick= 1;          // Avoid history
1701
1699
    status.setExitStatus(1);
3695
3693
  }
3696
3694
  else
3697
3695
    opt_rehash= 0;
3698
 
  error=sql_connect(current_host, current_db, current_user, opt_password,0);
 
3696
  error=sql_connect(current_host, current_db, current_user, opt_password);
3699
3697
  opt_rehash= save_rehash;
3700
3698
 
3701
3699
  if (connected)
4004
4002
 
4005
4003
 
4006
4004
static int
4007
 
sql_connect(const string &host, const string &database, const string &user, const string &password,
4008
 
                 uint32_t silent)
 
4005
sql_connect(const string &host, const string &database, const string &user, const string &password)
4009
4006
{
4010
4007
  drizzle_return_t ret;
4011
4008
  if (connected)
4054
4051
*/
4055
4052
  if ((ret= drizzle_con_connect(&con)) != DRIZZLE_RETURN_OK)
4056
4053
  {
4057
 
    if (!silent || (ret != DRIZZLE_RETURN_GETADDRINFO &&
4058
 
                    ret != DRIZZLE_RETURN_COULD_NOT_CONNECT))
 
4054
 
 
4055
    if (opt_silent < 2)
4059
4056
    {
4060
4057
      (void) put_error(&con, NULL);
4061
4058
      (void) fflush(stdout);