Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HammerDB: Passwordless MariaDB connection #408

Merged
merged 1 commit into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/mariadb/mariaolap.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ proc ConnectToMaria { host port socket ssl_options user password } {
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down Expand Up @@ -698,7 +701,10 @@ proc ConnectToMaria { host port socket ssl_options user password db } {
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down Expand Up @@ -1286,7 +1292,10 @@ proc ConnectToMaria { host port socket ssl_options user password db } {
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down
25 changes: 20 additions & 5 deletions src/mariadb/mariaoltp.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,10 @@ proc ConnectToMaria { host port socket ssl_options user password } {
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down Expand Up @@ -1399,7 +1402,10 @@ proc ConnectToMaria { host port socket ssl_options user password db } {
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down Expand Up @@ -1729,7 +1735,10 @@ proc ConnectToMaria { host port socket ssl_options user password db } {
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down Expand Up @@ -2114,7 +2123,10 @@ proc ConnectToMaria { host port socket ssl_options user password db } {
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down Expand Up @@ -2154,7 +2166,10 @@ proc ConnectToMariaAsynch { host port socket ssl_options user password db client
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down
5 changes: 4 additions & 1 deletion src/mariadb/mariaotc.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ proc tcount_maria {bm interval masterthread} {
foreach key [ dict keys $ssl_options ] {
append connectstring " $key [ dict get $ssl_options $key ] "
}
append connectstring " -user $user -password $password"
append connectstring " -user $user"
if { [ string tolower $password ] != "null" } {
append connectstring " -password $password"
}
set login_command "mariaconnect [ dict get $connectstring ]"
#eval the login command
if [catch {set maria_handler [eval $login_command]}] {
Expand Down