bufix: buildresultset

siddontang · siddontang · commit 08039859995b · 2014-08-19T15:37:03.000+08:00
diff --git a/proxy/conn_resultset.go b/proxy/conn_resultset.go
@@ -78,7 +78,8 @@ func (c *Conn) buildResultset(names []string, values [][]interface{}) (*Resultse
 		row = row[0:0]
 		for j, value := range vs {
 			if i == 0 {
-				field := r.Fields[j]
+				field := &Field{}
+				r.Fields[j] = field
 				field.Name = hack.Slice(names[j])
 
 				if err = formatField(field, value); err != nil {
diff --git a/proxy/conn_show.go b/proxy/conn_show.go
@@ -34,7 +34,7 @@ func (c *Conn) handleShowDatabases() (*Resultset, error) {
 		dbs = append(dbs, key)
 	}
 
-	return c.buildShowResultset(dbs, "Database")
+	return c.buildSimpleShowResultset(dbs, "Database")
 }
 
 func (c *Conn) handleShowTables(sql string, stmt *sqlparser.Show) (*Resultset, error) {
@@ -82,10 +82,10 @@ func (c *Conn) handleShowTables(sql string, stmt *sqlparser.Show) (*Resultset, e
 		values[i] = tables[i]
 	}
 
-	return c.buildShowResultset(values, fmt.Sprintf("Tables_in_%s", s.db))
+	return c.buildSimpleShowResultset(values, fmt.Sprintf("Tables_in_%s", s.db))
 }
 
-func (c *Conn) buildShowResultset(values []interface{}, name string) (*Resultset, error) {
+func (c *Conn) buildSimpleShowResultset(values []interface{}, name string) (*Resultset, error) {
 
 	r := new(Resultset)
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (c Conn) handleShowDatabases() (Resultset, error) {`
`34`	`34`	`dbs = append(dbs, key)`
`35`	`35`	`}`
`36`	`36`
`37`		`- return c.buildShowResultset(dbs, "Database")`
	`37`	`+ return c.buildSimpleShowResultset(dbs, "Database")`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`func (c Conn) handleShowTables(sql string, stmt sqlparser.Show) (*Resultset, error) {`
`@@ -82,10 +82,10 @@ func (c Conn) handleShowTables(sql string, stmt sqlparser.Show) (*Resultset, e`
`82`	`82`	`values[i] = tables[i]`
`83`	`83`	`}`
`84`	`84`
`85`		`- return c.buildShowResultset(values, fmt.Sprintf("Tables_in_%s", s.db))`
	`85`	`+ return c.buildSimpleShowResultset(values, fmt.Sprintf("Tables_in_%s", s.db))`
`86`	`86`	`}`
`87`	`87`
`88`		`-func (c Conn) buildShowResultset(values []interface{}, name string) (Resultset, error) {`
	`88`	`+func (c Conn) buildSimpleShowResultset(values []interface{}, name string) (Resultset, error) {`
`89`	`89`
`90`	`90`	`r := new(Resultset)`
`91`	`91`