summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-04-29 20:18:19 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-04-29 20:18:19 -0300
commit55b7b7563725f3f4273c3175cfa0d867afc18857 (patch)
treef95e09dbdce7c6254c97619437e1231efe749ac6 /include
parent49318af314029097181fb188a19d3ce9be1ab7e4 (diff)
parent14ccbeb4e40042e3fe624707d5b2e6c047149a2f (diff)
downloadmariadb-git-55b7b7563725f3f4273c3175cfa0d867afc18857.tar.gz
Manual merge.
Diffstat (limited to 'include')
-rw-r--r--include/mysql_com.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index db5a5eb8741..7d3dd3d4f34 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -277,6 +277,16 @@ typedef struct st_net {
/** Client library sqlstate buffer. Set along with the error message. */
char sqlstate[SQLSTATE_LENGTH+1];
void *extension;
+#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
+ /*
+ Controls whether a big packet should be skipped.
+
+ Initially set to FALSE by default. Unauthenticated sessions must have
+ this set to FALSE so that the server can't be tricked to read packets
+ indefinitely.
+ */
+ my_bool skip_big_packet;
+#endif
} NET;