← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/mysql_priv.h

Committer: Monty Taylor
Date: 2008-07-07 20:53:23 UTC
mfrom: (84 drizzle)
mto: (28.2.2 packaging) (80.3.5 drizzle-stew-remove-old_password) (77.6.1 glibclient-merge)
mto: This revision was merged to the branch mainline in revision 104.
Revision ID: monty@inaugust.com-20080707205323-053am5em7fy4sdwi

Merged from trunk.

files removed:
scripts/mysql_system_tables.sql

scripts/mysql_system_tables_fix.sql

scripts/mysql_test_data_timezone.sql

files modified:
mysql-test/mysql-test-run.pl

mysql-test/r/information_schema.result

mysql-test/r/join.result

mysql-test/r/lock.result

mysql-test/t/information_schema.test

mysql-test/t/join.test

mysql-test/t/lock.test

scripts/Makefile.am

sql/mysql_priv.h

sql/mysqld.cc

sql/sql_udf.cc

sql/table.cc

Show diffs side-by-side

added added

removed removed

sql/mysql_priv.h

1769

1769

extern my_bool opt_slave_compressed_protocol, use_temp_pool;

1770

1770

extern ulong slave_exec_mode_options;

1771

1771

extern my_bool opt_readonly, lower_case_file_system;

1772

extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;

1772

extern my_bool opt_enable_named_pipe, opt_sync_frm;

1773

1773

extern my_bool opt_secure_auth;

1774

1774

extern char* opt_secure_file_priv;

1775

1775

extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements;

Older »