diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-12-01 10:25:11 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-12-01 10:25:11 +0200 |
| commit | 0a24ac9ed2533a71f2188f348cc6eef27d57d783 (patch) | |
| tree | edeca3c5e130e4bf73e6ba9ed3e85621b1a909b0 /sql/sql_class.h | |
| parent | a49025d2c86adefcb61517ff75434479b75b8d02 (diff) | |
| parent | 4386e0c3484ae892107243c51188bfe51fcf53d1 (diff) | |
| download | mariadb-git-0a24ac9ed2533a71f2188f348cc6eef27d57d783.tar.gz | |
Merge
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
SCCS merged
mysql-test/t/subselect.test:
SCCS merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 6d77b75d70f..56824f2e27d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -399,6 +399,12 @@ struct system_variables #ifdef HAVE_INNOBASE_DB my_bool innodb_table_locks; #endif /* HAVE_INNOBASE_DB */ +#ifdef HAVE_NDBCLUSTER_DB + ulong ndb_autoincrement_prefetch_sz; + my_bool ndb_force_send; + my_bool ndb_use_exact_count; + my_bool ndb_use_transactions; +#endif /* HAVE_NDBCLUSTER_DB */ my_bool old_passwords; /* Only charset part of these variables is sensible */ |