From ddbccc0054a64f5e7a8c391e34e2d319051acc11 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 6 Feb 2022 16:00:04 -0300 Subject: Some (minor) SQL updates, such as making login UNIQUE. Also, what's wrong with valgrind. --- .gitlab-ci.yml | 11 +++++------ sql-files/main.sql | 58 +++++++++++++++++++++++++++--------------------------- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10095d26b..2850c3b10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,11 +88,6 @@ mysql_run_5.7: git-core make autoconf automake autopoint apt-utils libssl-dev openssl libtool libmysqlclient-dev libz-dev libpcre3-dev" - - ls /usr/include/openssl/ - - grep -nR CRYPTO_new_ex_data /usr/include/openssl/ - - ls /usr/lib/x86_64-linux-gnu/ | grep libcrypto #locate libcrypto.so - - nm /usr/lib/x86_64-linux-gnu/libcrypto.a | grep CRYPTO_new - - ldd /usr/bin/openssl - ./.tools/jobs/cloneall.sh - ./.tools/jobs/initdb.sh mysql - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize" @@ -145,8 +140,12 @@ mariadb_run_valgrind_latest: gcc-6 git-core make autoconf automake autopoint - libssl-dev libtool libmariadbclient-dev libz-dev libpcre3-dev + libssl-dev openssl libtool libmariadbclient-dev libz-dev libpcre3-dev valgrind" + - grep -nR CRYPTO_new_ex_data /usr/include/openssl/ + - ls /usr/lib/x86_64-linux-gnu/ | grep libcrypto #locate libcrypto.so + - nm /usr/lib/x86_64-linux-gnu/libcrypto.a | grep CRYPTO_new + - ldd /usr/bin/openssl - ./.tools/jobs/cloneall.sh - ./.tools/jobs/initdb.sh mariadb - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --disable-manager --enable-Werror --enable-buildbot" "--enable-werror" diff --git a/sql-files/main.sql b/sql-files/main.sql index e248fdc82..5aa064ac0 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS `acc_reg_str_db` ( `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0', `key` VARCHAR(32) BINARY NOT NULL DEFAULT '', `index` INT(11) UNSIGNED NOT NULL DEFAULT '0', - `value` VARCHAR(254) NOT NULL DEFAULT '0', + `value` VARCHAR(255) NOT NULL DEFAULT '0', PRIMARY KEY (`account_id`,`key`,`index`), KEY `account_id` (`account_id`) ) ENGINE=MyISAM; @@ -276,7 +276,7 @@ CREATE TABLE IF NOT EXISTS `char_reg_str_db` ( `char_id` INT(11) UNSIGNED NOT NULL DEFAULT '0', `key` VARCHAR(32) BINARY NOT NULL DEFAULT '', `index` INT(11) UNSIGNED NOT NULL DEFAULT '0', - `value` VARCHAR(254) NOT NULL DEFAULT '0', + `value` VARCHAR(255) NOT NULL DEFAULT '0', PRIMARY KEY (`char_id`,`key`,`index`), KEY `char_id` (`char_id`) ) ENGINE=MyISAM; @@ -335,23 +335,23 @@ CREATE TABLE IF NOT EXISTS `patreon` ( -- CREATE TABLE IF NOT EXISTS `elemental` ( - `ele_id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `char_id` INT(11) NOT NULL, - `class` MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0', - `mode` INT(11) UNSIGNED NOT NULL DEFAULT '1', - `hp` INT(12) NOT NULL DEFAULT '1', - `sp` INT(12) NOT NULL DEFAULT '1', - `max_hp` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', - `max_sp` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0', - `atk1` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0', - `atk2` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0', - `matk` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0', - `aspd` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `def` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `mdef` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `flee` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `hit` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `life_time` INT(11) NOT NULL DEFAULT '0', + `ele_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `char_id` INT NOT NULL, + `class` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0', + `mode` INT UNSIGNED NOT NULL DEFAULT '1', + `hp` INT NOT NULL DEFAULT '1', + `sp` INT NOT NULL DEFAULT '1', + `max_hp` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0', + `max_sp` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0', + `atk1` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0', + `atk2` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0', + `matk` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0', + `aspd` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `def` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `mdef` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `flee` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `hit` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `life_time` INT NOT NULL DEFAULT '0', PRIMARY KEY (`ele_id`) ) ENGINE=MyISAM; @@ -400,7 +400,7 @@ CREATE TABLE IF NOT EXISTS `global_acc_reg_str_db` ( `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0', `key` VARCHAR(32) BINARY NOT NULL DEFAULT '', `index` INT(11) UNSIGNED NOT NULL DEFAULT '0', - `value` VARCHAR(254) NOT NULL DEFAULT '0', + `value` VARCHAR(255) NOT NULL DEFAULT '0', PRIMARY KEY (`account_id`,`key`,`index`), KEY `account_id` (`account_id`) ) ENGINE=MyISAM; @@ -578,12 +578,12 @@ CREATE TABLE IF NOT EXISTS `homunculus` ( `exp` INT(12) NOT NULL DEFAULT '0', `intimacy` INT(12) NOT NULL DEFAULT '0', `hunger` SMALLINT(4) NOT NULL DEFAULT '0', - `str` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `agi` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `vit` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `INT` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `dex` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', - `luk` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0', + `str` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `agi` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `vit` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `INT` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `dex` SMALLINT UNSIGNED NOT NULL DEFAULT '0', + `luk` SMALLINT UNSIGNED NOT NULL DEFAULT '0', `hp` INT(12) NOT NULL DEFAULT '1', `max_hp` INT(12) NOT NULL DEFAULT '1', `sp` INT(12) NOT NULL DEFAULT '1', @@ -650,7 +650,7 @@ CREATE TABLE IF NOT EXISTS `ipbanlist` ( `rtime` DATETIME NULL, `reason` VARCHAR(255) NOT NULL DEFAULT '', KEY (`list`(39)) -) ENGINE=MyISAM; +) ENGINE=MyISAM; -- Move to InnoDB ? -- -- Table structure for table `login` @@ -658,7 +658,7 @@ CREATE TABLE IF NOT EXISTS `ipbanlist` ( CREATE TABLE IF NOT EXISTS `login` ( `account_id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `userid` VARCHAR(23) NOT NULL DEFAULT '', + `userid` VARCHAR(23) NOT NULL, `user_pass` VARCHAR(64) NOT NULL DEFAULT '', `sex` ENUM('M','F','S') NOT NULL DEFAULT 'M', `email` VARCHAR(39) NOT NULL DEFAULT '', @@ -674,7 +674,7 @@ CREATE TABLE IF NOT EXISTS `login` ( `pincode` VARCHAR(4) NOT NULL DEFAULT '', `pincode_change` INT(11) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (`account_id`), - KEY `name` (`userid`) + UNIQUE KEY `name` (`userid`) ) ENGINE=MyISAM AUTO_INCREMENT=2000000; -- added standard accounts for servers, VERY INSECURE!!! -- cgit v1.2.3-60-g2f50