diff options
| author | unknown <brian@zim.(none)> | 2006-09-15 10:48:30 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-15 10:48:30 -0700 |
| commit | eceb03503dd7bb596c55429d6340a8b8d3a802c5 (patch) | |
| tree | 38a741c6830b8df62515decf91468e563103df0c /sql/set_var.cc | |
| parent | 7d131bcde2b28d49889c83d870feafe8dd18f8d9 (diff) | |
| parent | d79485a9be6b2f638fd268aae9c4d0b4056a85d5 (diff) | |
| download | mariadb-git-eceb03503dd7bb596c55429d6340a8b8d3a802c5.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/merge-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index e09c75573eb..5fb209b8b11 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -3591,7 +3591,7 @@ byte *sys_var_thd_storage_engine::value_ptr(THD *thd, enum_var_type type, void sys_var_thd_storage_engine::set_default(THD *thd, enum_var_type type) { if (type == OPT_GLOBAL) - global_system_variables.*offset= &myisam_hton; + global_system_variables.*offset= myisam_hton; else thd->variables.*offset= global_system_variables.*offset; } |