Using LDAP groups from attributes -- attribute values containing apostrophes cause MySQL query errors

(Installation details: OS Ubuntu 6.06, PHP 5, MySQL 5.0, Drupal 5.1 & using ldap authentication against AD)

My problem is the same one listed in this previously-fixed issue:

http://drupal.org/node/78664

I am using the ldap groups option where groups are specified by LDAP attributes, and several of the entries in the particular ldap attribute I'm using contain an apostrophe (not my choice, but I am not the AD administrator). I get this sql error:

You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'Meeting'' at line 1 query: SELECT * FROM role WHERE name = '!Managers' Meeting' in /var/www/apache2-default/drupal-5.1/includes/database.mysql.inc on line 172.

This issue was resolved with revision 1.1.2.4, 20 Aug 2006; however, the fix was lost with revision 1.1.4.6, 04 Nov 2006. I put back the three one-line changes where the query is set up, so I'm running ok, but I'd like to not have to worry about this fix disappearing in the future the next time I upgrade.