Merge with 5.1 to get bug fix for LP#613408 Memory corruption with (M)aria storage engine and virtual columns

Fixed test case to test for virtual columns

mysql-test/mysql-test-run.pl

@@ -4537,7 +4537,7 @@ sub mysqld_stop {
      name          => "mysqladmin shutdown ".$mysqld->name(),
      path          => $exe_mysqladmin,
      args          => \$args,
-     error         => "/dev/null",
+     error         => "$opt_vardir/log/mysqladmin.err",
 
     );
 }