summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2006-06-05 06:16:08 +0300
committermonty@mysql.com <>2006-06-05 06:16:08 +0300
commit430347f12622b98d4e87bc2c33934335f410029b (patch)
tree4be36749abc142ae1362b83f9053e569a7a98099 /sql/mysqld.cc
parentc46fb742b82d9e894fc8ec92ec18b804af48b1b2 (diff)
downloadmariadb-git-430347f12622b98d4e87bc2c33934335f410029b.tar.gz
After merge fixes
Remove compiler warnings
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 876485ef35c..b1b68093d17 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7011,7 +7011,7 @@ static void mysql_init_variables(void)
character_set_filesystem_name= (char*) "binary";
/* Set default values for some option variables */
- default_storage_engine_str="MyISAM";
+ default_storage_engine_str= (char*) "MyISAM";
global_system_variables.table_type= &myisam_hton;
global_system_variables.tx_isolation= ISO_REPEATABLE_READ;
global_system_variables.select_limit= (ulonglong) HA_POS_ERROR;