[Bio] / FigKernelPackages / DBrtns.pm Repository:
ViewVC logotype

Diff of /FigKernelPackages/DBrtns.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20, Fri Jun 24 21:40:16 2005 UTC revision 1.22, Tue Aug 16 19:41:12 2005 UTC
# Line 32  Line 32 
32  =cut  =cut
33    
34  sub get_inserted_id {  sub get_inserted_id {
35      my($self, $table, $sth) = @_;      my($self, $table, $sth, $id_column) = @_;
36    
37        $id_column = 'id' unless defined($id_column);
38      if ($self->{_dbms} eq "Pg") {      if ($self->{_dbms} eq "Pg") {
39          my $oid = $sth->{pg_oid_status};          my $oid = $sth->{pg_oid_status};
40          my $ret = $self->SQL("select id from $table where oid = ?", undef, $oid);          my $ret = $self->SQL("select $id_column from $table where oid = ?", undef, $oid);
41          return $ret->[0]->[0];          return $ret->[0]->[0];
42      } elsif ($self->{_dbms} eq "mysql") {      } elsif ($self->{_dbms} eq "mysql") {
43          my $id = $self->{_dbh}->{mysql_insertid};          my $id = $self->{_dbh}->{mysql_insertid};
# Line 170  Line 172 
172      push(@opts, "--old-password");      push(@opts, "--old-password");
173      push(@opts, "--max-allowed-packet=128M");      push(@opts, "--max-allowed-packet=128M");
174      #      #
175        # Use InnoDB for large-table support and allegedly better performance.
176        #
177    
178        push(@opts, "--default-table-type=innodb");
179    
180        #
181      # Oddly, this doesn't seem to work. need to set the environment variable.      # Oddly, this doesn't seem to work. need to set the environment variable.
182      #      #
183      #push(@opts, "--port=$FIG_Config::dbport");      #push(@opts, "--port=$FIG_Config::dbport");
# Line 185  Line 193 
193      #      #
194    
195      my $exe = "$FIG_Config::ext_bin/mysqld_safe";      my $exe = "$FIG_Config::ext_bin/mysqld_safe";
196    
197        print "Start $exe @opts\n";
198      if (! -x $exe)      if (! -x $exe)
199      {      {
200          $exe = "mysqld_safe";          $exe = "mysqld_safe";

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.22

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3