- Fix database updates

PR:		136391
Submitted by:	Paul Schmehl <pauls@utdallas.edu> (maintainer)
This commit is contained in:
Dmitry Marakasov 2009-07-07 13:20:24 +00:00
parent f10a6c50bb
commit e58dcdfc21
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=237342
3 changed files with 23 additions and 1 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= sguil-server
PORTVERSION= 0.7.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= sguil

View File

@ -0,0 +1,11 @@
--- lib/SguildLoaderd.tcl.bak 2009-07-06 14:53:16.000000000 -0500
+++ lib/SguildLoaderd.tcl 2009-07-06 14:53:56.000000000 -0500
@@ -225,7 +225,7 @@
} else {
# Make sure its a MERGE table and not the old monster
set tableStatus [mysqlsel $LOADERD_DB_ID {SHOW TABLE STATUS LIKE 'sancp'} -flatlist]
- if { [lindex $tableStatus 1] != "MRG_MyISAM" } {
+ if { [lindex $tableStatus 1] != "MRG_MYISAM" } {
ErrorMessage "ERROR: loaderd: You appear to be using an old version of the\n\
sguil database schema that does not support the MERGE sancp\n\
table. Please see the CHANGES document for more information\n."

View File

@ -0,0 +1,11 @@
--- lib/SguildMysqlMerge.tcl.bak 2009-07-06 14:53:27.000000000 -0500
+++ lib/SguildMysqlMerge.tcl 2009-07-06 14:54:26.000000000 -0500
@@ -9,7 +9,7 @@
set tmpQry "SHOW TABLE STATUS LIKE '$tableName'"
set tableStatus [mysqlsel $MAIN_DB_SOCKETID $tmpQry -flatlist]
- if { $tableStatus != "" && [lindex $tableStatus 1] != "MRG_MyISAM" } {
+ if { $tableStatus != "" && [lindex $tableStatus 1] != "MRG_MYISAM" } {
# Non MERGE table found.
set errorMsg "\n*************************************************************\n