pull + update

CREATE TABLE IF NOT EXISTS `wacko_users_settings` (
  `setting_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
  `user_id` int(10) unsigned NOT NULL,
  `theme` varchar(20)  DEFAULT NULL,
  `lang` varchar(2)  DEFAULT NULL,
  `bookmarks` text ,
  `motto` text ,
  `changes_count` int(10) unsigned DEFAULT NULL,
  `revisions_count` int(10) unsigned DEFAULT NULL,
  `dont_redirect` tinyint(1) unsigned DEFAULT NULL,
  `send_watchmail` tinyint(1) unsigned DEFAULT NULL,
  `show_files` tinyint(1) unsigned DEFAULT NULL,
  `show_comments` tinyint(1) unsigned DEFAULT NULL,
  `doubleclick_edit` tinyint(1) unsigned DEFAULT NULL,
  `show_spaces` tinyint(1) unsigned DEFAULT NULL,
  `typografica` tinyint(1) unsigned DEFAULT NULL,
  `allow_intercom` tinyint(1) unsigned DEFAULT NULL,
  `autocomplete` tinyint(1) unsigned DEFAULT NULL,
  `hide_lastsession` tinyint(1) unsigned DEFAULT NULL,
  `validate_ip` tinyint(1) unsigned DEFAULT NULL,
  `noid_pubs` tinyint(1) unsigned DEFAULT NULL,
  `timezone` varchar(32)  DEFAULT NULL,
  PRIMARY KEY (`setting_id`),
  UNIQUE KEY `idx_user_id` (`user_id`),
  KEY `idx_send_watchmail` (`send_watchmail`)
) ENGINE=MyISAM;

{{adminupdate}}

ALTER TABLE `wacko_users` DROP `motto` ,
DROP `revisions_count` ,
DROP `changes_count` ,
DROP `doubleclick_edit` ,
DROP `show_comments` ,
DROP `bookmarks` ,
DROP `lang` ,
DROP `show_spaces` ,
DROP `typografica` ,
DROP `more` ;

ALTER TABLE `wacko_users` ADD `login_count` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `session_expire` ,
ADD `lost_password_request_count` SMALLINT( 6 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `login_count` ,
ADD `failed_login_count` SMALLINT( 6 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `lost_password_request_count` 

UPDATE wacko_users_settings SET theme = 'default' WHERE theme =  ''