~drizzle-trunk/drizzle/development

_("Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default."))

1414

1465

("disable-tee", po::value<bool>()->default_value(false)->zero_tokens(),

1422

1473

("max-join-size", po::value<uint32_t>(&max_join_size)->default_value(1000000L),

1423

1474

_("Automatic limit for rows in a join when using --safe-updates"))

1424

1475

;

1425

1476

#ifndef DRIZZLE_ADMIN_TOOL

1477

const char* unix_user= getlogin();

1478

#endif

1426

1479

po::options_description client_options(_("Options specific to the client"));

1427

1480

client_options.add_options()

1428

1481

("host,h", po::value<string>(&current_host)->default_value("localhost"),

1434

1487

#ifdef DRIZZLE_ADMIN_TOOL

1435

1488

("user,u", po::value<string>(&current_user)->default_value("root"),

1436

1489

#else

1437

("user,u", po::value<string>(&current_user)->default_value(""),

1490

("user,u", po::value<string>(&current_user)->default_value((unix_user ? unix_user : "")),

1438

1491

#endif

1439

1492

_("User for login if not current user."))

1440

1493

("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),

1441

_("The protocol of connection (mysql or drizzle)."))

1494

_("The protocol of connection (mysql, mysql-plugin-auth, or drizzle)."))

1442

1495

;

1443

1496

1444

1497

po::options_description long_options(_("Allowed Options"));

1654

1707

opt_protocol.begin(), ::tolower);

1655

1708

1656

1709

if (not opt_protocol.compare("mysql"))

1657

use_drizzle_protocol=false;

1710

{

1711

1712

global_con_options= (drizzle_con_options_t)(DRIZZLE_CON_MYSQL|DRIZZLE_CON_INTERACTIVE);

1713

use_drizzle_protocol= false;

1714

}

1715

else if (not opt_protocol.compare("mysql-plugin-auth"))

1716

{

1717

global_con_options= (drizzle_con_options_t)(DRIZZLE_CON_MYSQL|DRIZZLE_CON_INTERACTIVE|DRIZZLE_CON_AUTH_PLUGIN);

1718

use_drizzle_protocol= false;

1719

}

1658

1720

else if (not opt_protocol.compare("drizzle"))

1659

use_drizzle_protocol=true;

1721

{

1722

global_con_options= (drizzle_con_options_t)(DRIZZLE_CON_EXPERIMENTAL);

1723

use_drizzle_protocol= true;

1724

}

1660

1725

else

1661

1726

{

1662

1727

cout << _("Error: Unknown protocol") << " '" << opt_protocol << "'" << endl;

1900

1965

drizzle_return_t ret;

1901

1966

1902

1967

/* terminate if no query being executed, or we already tried interrupting */

1903

if (!executing_query || interrupted_query) {

1968

if (!executing_query || interrupted_query)

1969

{

1904

1970

goto err;

1905

1971

}

1906

1972

1973

2039

default_pager_set= 0;

1974

2040

opt_outfile= 0;

1975

2041

opt_reconnect= 0;

1976

connect_flag= DRIZZLE_CAPABILITIES_NONE; /* Not in interactive mode */

1977

2042

}

1978

2043

1979

2044

if (tty_password)

4175

4240

drizzle_create(&drizzle);

4176

4241

4177

4242

#ifdef DRIZZLE_ADMIN_TOOL

4178

drizzle_con_options_t options= (drizzle_con_options_t) (DRIZZLE_CON_ADMIN | (use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL));

4179

#else

4180

drizzle_con_options_t options= (drizzle_con_options_t) (use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL);

4243

global_con_options= (drizzle_con_options_t) (DRIZZLE_CON_ADMIN | global_con_options);

4181

4244

#endif

4182

4245

4183

4246

if (drizzle_con_add_tcp(&drizzle, &con, (char *)host.c_str(),

4184

opt_drizzle_port, (char *)user.c_str(),

4185

(char *)password.c_str(), (char *)database.c_str(),

4186

options) == NULL)

4247

opt_drizzle_port, (char *)user.c_str(),

4248

(char *)password.c_str(), (char *)database.c_str(),

4249

global_con_options) == NULL)

4187

4250

{

4188

4251

(void) put_error(&con, NULL);

4189

4252

(void) fflush(stdout);

4190

4253

return 1;

4191

4254

}

4192

4255

4193

/* XXX add this back in

4194

if (opt_connect_timeout)

4195

{

4196

uint32_t timeout=opt_connect_timeout;

4197

drizzleclient_options(&drizzle,DRIZZLE_OPT_CONNECT_TIMEOUT,

4198

(char*) &timeout);

4199

}

4200

4201

4202

/* XXX Do we need this?

4203

if (safe_updates)

4204

{

4205

char init_command[100];

4206

sprintf(init_command,

4207

"SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=%"PRIu32

4208

",MAX_JOIN_SIZE=%"PRIu32,

4209

select_limit, max_join_size);

4210

drizzleclient_options(&drizzle, DRIZZLE_INIT_COMMAND, init_command);

4211

}

4212

4213

4256

if ((ret= drizzle_con_connect(&con)) != DRIZZLE_RETURN_OK)

4214

4257

{

4215

4258

4221

4264

}

4222

4265

return -1; // Retryable

4223

4266

}

4224

connected=1;

4267

connected= 1;

4225

4268

4226

4269

ServerDetect server_detect(&con);

4227

4270

server_type= server_detect.getServerType();

Older »