[Lsb-messages] /var/www/bzr/lsb/devel/libtodb2 r44: Find another case of the previous problem and fix it.

[Jeff Licquia]

------------------------------------------------------------
revno: 44
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: libtodb2
timestamp: Mon 2013-10-28 19:41:01 -0400
message:
  Find another case of the previous problem and fix it.
modified:
  headertodb2/prepare_sql.pl
-------------- next part --------------
=== modified file 'headertodb2/prepare_sql.pl'
--- a/headertodb2/prepare_sql.pl	2013-10-24 13:39:30 +0000
+++ b/headertodb2/prepare_sql.pl	2013-10-28 23:41:01 +0000
@@ -473,7 +473,9 @@
 #        print "SET \@Tid=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype' AND Theadgroup > 0);\n";
     }
     else {
-        print "SET \@Tid=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype' AND Tlibrary='$library');\n";
+        print "SET \@Tid1=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype' AND Tlibrary='$library');\n";
+        print "SET \@Tid2=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype' LIMIT 1);\n";
+        print "SET \@Tid=(SELECT IFNULL(\@Tid1,\@Tid2));\n";
     }
 
     $xh = $dbh->prepare("SELECT DISTINCT Iname FROM Interface WHERE Ilibrary='$library' AND Iunmangled LIKE '%::$Iname(%'");