Skip to content

bugzilla
bugzilla
Commit 71e0de63 authored by justdave%syndicomm.com's avatar justdave%syndicomm.com
Browse files
Options

Fix for bug 95731: "INSERT INTO shadowlog" failed because "Table 'shadowlog' not…

Fix for bug 95731: "INSERT INTO shadowlog" failed because "Table 'shadowlog' not locked", fixed typo in lock tables command. Patch by Myk Melez <myk@mozilla.org> r= justdave@syndicomm.com
parent df2f05d6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Bugzilla/Token.pm
View file @ 71e0de63
...@@ -52,7 +52,7 @@ sub IssuePasswordToken { ...@@ -52,7 +52,7 @@ sub IssuePasswordToken {
# Generate a unique token and insert it into the tokens table. # Generate a unique token and insert it into the tokens table.
# We have to lock the tokens table before generating the token, # We have to lock the tokens table before generating the token,
# since the database must be queried for token uniqueness. # since the database must be queried for token uniqueness.
&::SendSQL("LOCK TABLE tokens WRITE"); &::SendSQL("LOCK TABLES tokens WRITE");
my $token = GenerateUniqueToken(); my $token = GenerateUniqueToken();
my $quotedtoken = &::SqlQuote($token); my $quotedtoken = &::SqlQuote($token);
my $quotedipaddr = &::SqlQuote($::ENV{'REMOTE_ADDR'}); my $quotedipaddr = &::SqlQuote($::ENV{'REMOTE_ADDR'});
...@@ -166,7 +166,7 @@ Cancelled Because: $cancelaction ...@@ -166,7 +166,7 @@ Cancelled Because: $cancelaction
close SENDMAIL; close SENDMAIL;
# Delete the token from the database. # Delete the token from the database.
&::SendSQL("LOCK TABLE tokens WRITE"); &::SendSQL("LOCK TABLES tokens WRITE");
&::SendSQL("DELETE FROM tokens WHERE token = $quotedtoken"); &::SendSQL("DELETE FROM tokens WHERE token = $quotedtoken");
&::SendSQL("UNLOCK TABLES"); &::SendSQL("UNLOCK TABLES");
} }
......
Token.pm
View file @ 71e0de63
...@@ -52,7 +52,7 @@ sub IssuePasswordToken { ...@@ -52,7 +52,7 @@ sub IssuePasswordToken {
# Generate a unique token and insert it into the tokens table. # Generate a unique token and insert it into the tokens table.
# We have to lock the tokens table before generating the token, # We have to lock the tokens table before generating the token,
# since the database must be queried for token uniqueness. # since the database must be queried for token uniqueness.
&::SendSQL("LOCK TABLE tokens WRITE"); &::SendSQL("LOCK TABLES tokens WRITE");
my $token = GenerateUniqueToken(); my $token = GenerateUniqueToken();
my $quotedtoken = &::SqlQuote($token); my $quotedtoken = &::SqlQuote($token);
my $quotedipaddr = &::SqlQuote($::ENV{'REMOTE_ADDR'}); my $quotedipaddr = &::SqlQuote($::ENV{'REMOTE_ADDR'});
...@@ -166,7 +166,7 @@ Cancelled Because: $cancelaction ...@@ -166,7 +166,7 @@ Cancelled Because: $cancelaction
close SENDMAIL; close SENDMAIL;
# Delete the token from the database. # Delete the token from the database.
&::SendSQL("LOCK TABLE tokens WRITE"); &::SendSQL("LOCK TABLES tokens WRITE");
&::SendSQL("DELETE FROM tokens WHERE token = $quotedtoken"); &::SendSQL("DELETE FROM tokens WHERE token = $quotedtoken");
&::SendSQL("UNLOCK TABLES"); &::SendSQL("UNLOCK TABLES");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment