Skip to content

Commit 654304f

Browse files
committed
Merge branch 'master' of https://github.com/go-sql-driver/mysql into colconv
2 parents e863117 + 7ff0b8c commit 654304f

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Luke Scott <luke at webconnex.com>
3131
Michael Woolnough <michael.woolnough at gmail.com>
3232
Nicola Peduzzi <thenikso at gmail.com>
3333
Runrioter Wung <runrioter at gmail.com>
34+
Soroush Pour <me at soroushjp.com>
3435
Xiaobing Jiang <s7v7nislands at gmail.com>
3536
Xiuming Chen <cc at cxm.cc>
3637

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ Default: UTC
205205

206206
Sets the location for time.Time values (when using `parseTime=true`). *"Local"* sets the system's location. See [time.LoadLocation](http://golang.org/pkg/time/#LoadLocation) for details.
207207

208+
Note that this sets the location for time.Time values but does not change MySQL's [time_zone setting](https://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html). For that see the [time_zone system variable](#system-variables), which can also be set as a DSN parameter.
209+
208210
Please keep in mind, that param values must be [url.QueryEscape](http://golang.org/pkg/net/url/#QueryEscape)'ed. Alternatively you can manually replace the `/` with `%2F`. For example `US/Pacific` would be `loc=US%2FPacific`.
209211

210212

@@ -257,7 +259,7 @@ Default: false
257259

258260
All other parameters are interpreted as system variables:
259261
* `autocommit`: `"SET autocommit=<value>"`
260-
* `time_zone`: `"SET time_zone=<value>"`
262+
* [`time_zone`](https://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html): `"SET time_zone=<value>"`
261263
* [`tx_isolation`](https://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html#sysvar_tx_isolation): `"SET tx_isolation=<value>"`
262264
* `param`: `"SET <param>=<value>"`
263265

const.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const (
2424
iERR byte = 0xff
2525
)
2626

27+
// https://dev.mysql.com/doc/internals/en/capability-flags.html#packet-Protocol::CapabilityFlags
2728
type clientFlag uint32
2829

2930
const (
@@ -45,6 +46,13 @@ const (
4546
clientSecureConn
4647
clientMultiStatements
4748
clientMultiResults
49+
clientPSMultiResults
50+
clientPluginAuth
51+
clientConnectAttrs
52+
clientPluginAuthLenEncClientData
53+
clientCanHandleExpiredPasswords
54+
clientSessionTrack
55+
clientDeprecateEOF
4856
)
4957

5058
const (
@@ -78,6 +86,7 @@ const (
7886
comStmtFetch
7987
)
8088

89+
// https://dev.mysql.com/doc/internals/en/com-query-response.html#packet-Protocol::ColumnType
8190
const (
8291
fieldTypeDecimal byte = iota
8392
fieldTypeTiny
@@ -132,7 +141,6 @@ const (
132141
)
133142

134143
// http://dev.mysql.com/doc/internals/en/status-flags.html
135-
136144
type statusFlag uint16
137145

138146
const (

0 commit comments

Comments
 (0)