diff options
| author | unknown <mats@romeo.(none)> | 2007-04-20 10:35:27 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-04-20 10:35:27 +0200 |
| commit | 8bc4d1828989af457864483e11186bc172d677bf (patch) | |
| tree | bd08208448c240ed7ccba699e7ca724c190b92ff /sql/sql_class.cc | |
| parent | 4eecb58fd65e77091c930f0a039a59e85d2c1b5d (diff) | |
| parent | b6451440b704985831b6d95182b120bf5143efce (diff) | |
| download | mariadb-git-8bc4d1828989af457864483e11186bc172d677bf.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.0-rpl
into romeo.(none):/home/bk/merge-mysql-5.0
client/mysql.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 984df3e84f9..6ec14426162 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -344,7 +344,6 @@ void THD::init(void) total_warn_count= 0; update_charset(); bzero((char *) &status_var, sizeof(status_var)); - variables.lc_time_names = &my_locale_en_US; } |