Bug #16240 datadir after basedir in my.cnf causes datadir to be possibly incorrect

Description:
If you specify datadir after basedir in my.cnf then datadir gets overwritten with $basedir/data due to this code in parse_server_arguments():

--basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'`
bindir="$basedir/bin"
datadir="$basedir/data"
sbindir="$basedir/sbin"
libexecdir="$basedir/libexec"
;;
--datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;

How to repeat:
see above

Suggested fix:
Maybe it should check that if datadir has already been set in the my.cnf don't set it again when setting --basedir.

A patch for this bug has been committed. After review, it may
be pushed to the relevant source trees for release in the next
version. You can access the patch from:

  http://lists.mysql.com/commits/4530

The comment for datadir_set needs to be updated. Shouldn't is say "datadir*" instead of "bindir*"

+# bindir_set is used to determine if bindir was set (and so should be
     ^^^^^^^^                                           ^^^^
+# *not* set inside of the --basedir= handler.)
+datadir_set=
+

A patch for this bug has been committed. After review, it may
be pushed to the relevant source trees for release in the next
version. You can access the patch from:

  http://lists.mysql.com/commits/4571

Need the 3-part version number(s) in which the fix will appear. (Otherwise, we don't know which changelog to document the fix in.) Thanks.

Looks like it will be in 5.0.21

Noted in 5.0.21, 5.1.9 changelogs.

For <command>mysql.server</command>, if the
<option>basedir</option> option was specified after
<option>datadir</option> in an option file, the setting for
<literal>datadir</literal> was ignored and assumed to be
located under <literal>basedir</literal>. (Bug #16240)