diff options
| author | unknown <kaa@polly.local> | 2007-05-28 12:52:05 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-05-28 12:52:05 +0400 |
| commit | 71e78d16ff2638affa7864ae2fcc8a0efdb1b9e9 (patch) | |
| tree | 4fea6fd04847e73e6e9f52860ac3c3f54de6f0c2 /sql/init.cc | |
| parent | 55153730b2aadba899284b2862647edefaa44757 (diff) | |
| parent | e3af3c2127132e327ea8dd21d942ef2e09d7f4d6 (diff) | |
| download | mariadb-git-71e78d16ff2638affa7864ae2fcc8a0efdb1b9e9.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
into polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
include/m_string.h:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/type_float.test:
Auto merged
sql/init.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/field.cc:
Manual merge.
sql/field.h:
Manual merge.
Diffstat (limited to 'sql/init.cc')
| -rw-r--r-- | sql/init.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sql/init.cc b/sql/init.cc index ff236c03204..73feaa797c3 100644 --- a/sql/init.cc +++ b/sql/init.cc @@ -21,8 +21,6 @@ void unireg_init(ulong options) { - uint i; - double nr; DBUG_ENTER("unireg_init"); MYSYS_PROGRAM_DONT_USE_CURSES(); @@ -40,16 +38,5 @@ void unireg_init(ulong options) VOID(strmov(reg_ext,".frm")); reg_ext_length= 4; specialflag=SPECIAL_SAME_DB_NAME | options; /* Set options from argv */ - /* Make a tab of powers of 10 */ - for (i=0,nr=1.0; i < array_elements(log_10) ; i++) - { /* It's used by filesort... */ - log_10[i]= nr ; nr*= 10.0; - } - /* Make a tab of powers of 0.1 */ - for (i= 0, nr= 0.1; i < array_elements(log_01); i++) - { - log_01[i]= nr; - nr*= 0.1; - } DBUG_VOID_RETURN; } |