1 files changed, 5 insertions, 1 deletions
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go
index 9d97d6d4f..ba606e146 100644
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go
+++ b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go
@@ -40,7 +40,11 @@ func (rows *mysqlRows) Columns() []string {
 	columns := make([]string, len(rows.columns))
 	if rows.mc.cfg.columnsWithAlias {
 		for i := range columns {
-			columns[i] = rows.columns[i].tableName + "." + rows.columns[i].name
+			if tableName := rows.columns[i].tableName; len(tableName) > 0 {
+				columns[i] = tableName + "." + rows.columns[i].name
+			} else {
+				columns[i] = rows.columns[i].name
+			}
 		}
 	} else {
 		for i := range columns {