mysql-test/r/user_var.result:
after merge fixes - old (erroneous) results restored.
Should be corrected when the fix is applied
mysql-test/t/user_var.test:
after merge fixes - old (erroneous) results restored.
Should be corrected when the fix is applied