diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-28 11:02:48 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-28 11:02:48 +0300 |
| commit | 7fd2585b08ff00df98e6309434cd0220524b8ae9 (patch) | |
| tree | 70b19d638c9beac263179291143f76c5af8757f4 /sql/set_var.cc | |
| parent | 42ba8b442d2024dc9f894223cf3d6ff0e8f2ba13 (diff) | |
| parent | ed61d47efe31765b0e6bce85266574b5e07c4fef (diff) | |
| download | mariadb-git-7fd2585b08ff00df98e6309434cd0220524b8ae9.tar.gz | |
merge
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
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 e08a65c793a..8195792419e 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -632,7 +632,7 @@ sys_var *sys_variables[]= */ struct show_var_st init_vars[]= { - {"auto_incrememt_increment", (char*) &sys_auto_increment_increment, SHOW_SYS}, + {"auto_increment_increment", (char*) &sys_auto_increment_increment, SHOW_SYS}, {"auto_increment_offset", (char*) &sys_auto_increment_offset, SHOW_SYS}, {"back_log", (char*) &back_log, SHOW_LONG}, {"basedir", mysql_home, SHOW_CHAR}, |