← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/mysql_priv.h

Merged in changes. 
Edited a the comment test case so deal with our version bump.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/mysql_priv.h
1752
1752
extern bool opt_using_transactions;
1753
1753
#endif /* MYSQL_SERVER */
1754
1754
#if defined MYSQL_SERVER || defined INNODB_COMPATIBILITY_HOOKS
1755
 
extern bool mysqld_embedded;
1756
1755
#endif /* MYSQL_SERVER || INNODB_COMPATIBILITY_HOOKS */
1757
1756
#ifdef MYSQL_SERVER
1758
 
extern bool using_update_log, opt_large_files, server_id_supplied;
 
1757
extern bool using_update_log, server_id_supplied;
1759
1758
extern bool opt_update_log, opt_bin_log, opt_error_log;
1760
1759
extern my_bool opt_log, opt_slow_log;
1761
1760
extern ulong log_output_options;
1781
1780
extern my_bool opt_enable_shared_memory;
1782
1781
extern char *default_tz_name;
1783
1782
#endif /* MYSQL_SERVER */
1784
 
#if defined MYSQL_SERVER || defined INNODB_COMPATIBILITY_HOOKS
1785
 
extern my_bool opt_large_pages;
1786
 
extern uint opt_large_page_size;
1787
 
#endif /* MYSQL_SERVER || INNODB_COMPATIBILITY_HOOKS */
1788
1783
#ifdef MYSQL_SERVER
1789
1784
extern char *opt_logname, *opt_slow_logname;
1790
1785
extern const char *log_output_str;