I am attaching a patch for MDEV-8356 as part of my work under GSoC2015 implementing table valued functions.