Commit 78ab9a9b authored by unknown's avatar unknown

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
parents 1452d666 af5bb184
...@@ -464,6 +464,7 @@ NdbTableImpl::init(){ ...@@ -464,6 +464,7 @@ NdbTableImpl::init(){
m_temporary = false; m_temporary = false;
m_row_gci = true; m_row_gci = true;
m_row_checksum = true; m_row_checksum = true;
m_force_var_part = false;
m_kvalue= 6; m_kvalue= 6;
m_minLoadFactor= 78; m_minLoadFactor= 78;
m_maxLoadFactor= 80; m_maxLoadFactor= 80;
...@@ -752,6 +753,7 @@ NdbTableImpl::assign(const NdbTableImpl& org) ...@@ -752,6 +753,7 @@ NdbTableImpl::assign(const NdbTableImpl& org)
m_temporary = org.m_temporary; m_temporary = org.m_temporary;
m_row_gci = org.m_row_gci; m_row_gci = org.m_row_gci;
m_row_checksum = org.m_row_checksum; m_row_checksum = org.m_row_checksum;
m_force_var_part = org.m_force_var_part;
m_kvalue = org.m_kvalue; m_kvalue = org.m_kvalue;
m_minLoadFactor = org.m_minLoadFactor; m_minLoadFactor = org.m_minLoadFactor;
m_maxLoadFactor = org.m_maxLoadFactor; m_maxLoadFactor = org.m_maxLoadFactor;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment