Core

I'm not going to fix this, as I don't know a sane/proper way to fix this.

The table format, and the format of the tables is different from master and edge.

see

mysql> select * from users; +----+-------+---------------------+------------------------------------------+------------------------------------------+---------------------------+----------------+---------------------+---------------------+---------------------+------+-------------------+--------------+-----------------+--------------------+ | id | login | email | crypted_password | salt | remember_token_expires_at | remember_token | time_zone | created_at | updated_at | name | default_formatter | activated_at | activation_code | password_reset_key | +----+-------+---------------------+------------------------------------------+------------------------------------------+---------------------------+----------------+---------------------+---------------------+---------------------+------+-------------------+--------------+-----------------+--------------------+ | 1 | damm | merbwtf@merbwtf.com | 3f0195d7a8dd85fdb4a8ce088d57585255aaa01a | 626b4dba3458a41f9772e13ca8b157426b007205 | NULL | NULL | America/Los_Angeles | 2008-08-13 14:10:39 | 2008-08-13 14:11:24 | damm | default | NULL | NULL | NULL | +----+-------+---------------------+------------------------------------------+------------------------------------------+---------------------------+----------------+---------------------+---------------------+---------------------+------+-------------------+--------------+-----------------+--------------------+ 1 row in set (0.00 sec)

When, edge is

mysql> select * from users; +----+-------+---------------+---------------------+---------------------+---------------------+-----------------+------------------------------------------+------------------------------------------+---------------------------+----------------+--------------------+---------------------+------+-------------------+ | id | login | email | created_at | updated_at | activated_at | activation_code | crypted_password | salt | remember_token_expires_at | remember_token | password_reset_key | time_zone | name | default_formatter | +----+-------+---------------+---------------------+---------------------+---------------------+-----------------+------------------------------------------+------------------------------------------+---------------------------+----------------+--------------------+---------------------+------+-------------------+ | 2 | admin | damm@livid.dk | 2008-08-01 03:38:02 | 2008-08-01 03:38:02 | 2008-08-01 03:38:02 | NULL | c7fc40c4f253d0a3b90f2ca3c897a2010c06684e | b9e3bbd201bafbfc8b7fbb5aed86ecf9004233d1 | NULL | NULL | NULL | America/Los_Angeles | NULL | default | +----+-------+---------------+---------------------+---------------------+---------------------+-----------------+------------------------------------------+------------------------------------------+---------------------------+----------------+--------------------+---------------------+------+-------------------+ 1 row in set (0.00 sec)

Obviously it's not too painful, but if we merge edge into master, it's going to cause some troubles.