~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/mysqld.cc

Committer: Brian Aker
Date: 2008-07-07 16:12:06 UTC
mfrom: (80.2.1 drizzle)
Revision ID: brian@tangent.org-20080707161206-28uh3e913yov5ikk

Merging up Mark's work for warning removal.

files modified:
sql/mysql_priv.h

sql/mysqld.cc

sql/sql_udf.cc

Show diffs side-by-side

added added

removed removed

sql/mysqld.cc

270

handlerton *myisam_hton;

271

272

my_bool opt_readonly, use_temp_pool, relay_log_purge;

273

my_bool opt_sync_frm, opt_allow_suspicious_udfs;

273

my_bool opt_sync_frm;

274

my_bool opt_secure_auth= 0;

275

char* opt_secure_file_priv= 0;

276

my_bool opt_log_slow_admin_statements= 0;

3320

OPT_WAIT_TIMEOUT,

3321

OPT_ERROR_LOG_FILE,

3322

OPT_DEFAULT_WEEK_FORMAT,

3323

OPT_RANGE_ALLOC_BLOCK_SIZE, OPT_ALLOW_SUSPICIOUS_UDFS,

3323

OPT_RANGE_ALLOC_BLOCK_SIZE,

3324

OPT_QUERY_ALLOC_BLOCK_SIZE, OPT_QUERY_PREALLOC_SIZE,

3325

OPT_TRANS_ALLOC_BLOCK_SIZE, OPT_TRANS_PREALLOC_SIZE,

3326

OPT_SYNC_FRM, OPT_SYNC_BINLOG,

3385

"Option used by mysql-test for debugging and testing of replication.",

3386

(uchar**) &abort_slave_event_count, (uchar**) &abort_slave_event_count,

3387

0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

3388

{"allow-suspicious-udfs", OPT_ALLOW_SUSPICIOUS_UDFS,

3389

"Allows use of UDFs consisting of only one symbol xxx() "

3390

"without corresponding xxx_init() or xxx_deinit(). That also means "

3391

"that one can load any function from any library, for example exit() "

3392

"from libc.so",

3393

(uchar**) &opt_allow_suspicious_udfs, (uchar**) &opt_allow_suspicious_udfs,

3394

0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

3395

3388

{"ansi", 'a', "Use ANSI SQL syntax instead of MySQL syntax. This mode will also set transaction isolation level 'serializable'.", 0, 0, 0,

3396

3389

GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

3397

3390

{"auto-increment-increment", OPT_AUTO_INCREMENT,

Older »