Commit 284243ce authored by terry%mozilla.org's avatar terry%mozilla.org
Browse files

Work with older versions of mysqltcl.

parent 20031238
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ set userdomain somedomain

# User and password for access to the MySQL bonsai database
# use empty string ("") for password if you want to access the database
# without using a password (not recommended)
# without using a password (not recommended).  If you are using an older
# version of mysqltcl, you may also need to set the username to be "".
set mysqluser nobody
set mysqlpassword ""

+6 −1
Original line number Diff line number Diff line
@@ -73,11 +73,16 @@ if {[info exists tcl_version] && $tcl_version >= 8.0} {
proc NOTDEF {foo} {
}


proc ConnectToDatabase {} {
    global mysqlhandle mysqluser mysqlpassword
    if {![info exists mysqlhandle]} {
        if { $mysqlpassword == "" } {
            if { $mysqluser == "" } {
                set mysqlhandle [mysqlconnect]
            } else {
                set mysqlhandle [mysqlconnect -user "$mysqluser"]
            }
        } else {
            set mysqlhandle [mysqlconnect -user "$mysqluser" -password "$mysqlpassword"]
        }