merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -0,0 +1,5 @@
<table name="member_denied_nick_name">
<column name="nick_name" type="varchar" size="80" notnull="notnull" primary_key="primary_key" />
<column name="regdate" type="date" />
<column name="description" type="text" />
</table>

View file

@ -1,5 +0,0 @@
<table name="member_openid">
<column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
<column name="openid" type="varchar" size="80" notnull="notnull" unique="unique_openid" />
<column name="regdate" type="date" index="idx_regdate" />
</table>

View file

@ -1,8 +0,0 @@
<table name="member_openid_association">
<column name="server_url" type="text" notnull="notnull" />
<column name="handle" type="varchar" size="255" notnull="notnull" />
<column name="secret" type="text" notnull="notnull" />
<column name="issued" type="number" size="11" />
<column name="lifetime" type="number" size="11" />
<column name="assoc_type" type="varchar" size="64" />
</table>

View file

@ -1,4 +0,0 @@
<table name="member_openid_nonce">
<column name="nonce" type="char" size="8" notnull="notnull" primary_key="primary_key" />
<column name="expires" type="number" size="11" />
</table>