diff options
| author | unknown <jonas@eel.(none)> | 2005-09-09 13:30:38 +0200 |
|---|---|---|
| committer | unknown <jonas@eel.(none)> | 2005-09-09 13:30:38 +0200 |
| commit | 12dbb18815863e82b91c4cc3eb4d28404720a11f (patch) | |
| tree | 0eb3c618a57f75600f5f0f758d521ccaa8e167b0 /sql/set_var.h | |
| parent | e371b26468bdb67fe668f3582c2f061c61835e84 (diff) | |
| parent | 394d180b5e04504c9e2d52d1eaa4904b2056eb19 (diff) | |
| download | mariadb-git-12dbb18815863e82b91c4cc3eb4d28404720a11f.tar.gz | |
Merge eel.(none):/home/jonas/src/mysql-5.0
into eel.(none):/home/jonas/src/mysql-5.1-push
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index b1c847973c1..8c1444870eb 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -190,6 +190,7 @@ public: return 1; } bool check_default(enum_var_type type) { return 1; } + bool is_readonly() const { return 1; } }; @@ -901,7 +902,7 @@ int sql_set_variables(THD *thd, List<set_var_base> *var_list); bool not_all_support_one_shot(List<set_var_base> *var_list); void fix_delay_key_write(THD *thd, enum_var_type type); ulong fix_sql_mode(ulong sql_mode); -extern sys_var_str sys_charset_system; +extern sys_var_const_str sys_charset_system; extern sys_var_str sys_init_connect; extern sys_var_str sys_init_slave; extern sys_var_thd_time_zone sys_time_zone; |