buildbot issues

* rpm upgrade fix
* update test results
* valgrind warning

sql/table.cc

@@ -2875,7 +2875,7 @@ unpack_vcol_info_from_frm(THD *thd, MEM_ROOT *mem_root, TABLE *table,
 
   DBUG_ASSERT(vcol->expr == NULL);
   
-  if (parser_state.init(thd, expr_str->c_ptr(), expr_str->length()))
+  if (parser_state.init(thd, expr_str->c_ptr_safe(), expr_str->length()))
     goto end;
 
   if (init_lex_with_single_table(thd, table, &lex))

support-files/rpm/server-prein.sh

@@ -4,7 +4,7 @@
 installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
 if [ $? -eq 0 -a -n "$installed" ]; then
   installed=`echo "$installed"|sed -n 1p`
-  vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
+  vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1 | sed 's/Monty Program AB/MariaDB Foundation/'`
   version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
   myvendor='%{mysql_vendor}'
   myversion='%{mysqlversion}'