summaryrefslogtreecommitdiff
path: root/include/mysql.h
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2003-06-09 14:51:40 +0500
committerunknown <hf@deer.(none)>2003-06-09 14:51:40 +0500
commit5551e0df2a5208ead3ca7d024083e572e21f8845 (patch)
treec4c3d3834aeb10d9d1a1125f7259c7d0e1ff6bed /include/mysql.h
parentf6722eac25d7ef63f31e8470d8f2cbde98931026 (diff)
parent0bb5b9eadddfc911bfaa7c6ee69db92fc7785c94 (diff)
downloadmariadb-git-5551e0df2a5208ead3ca7d024083e572e21f8845.tar.gz
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way BitKeeper/etc/logging_ok: auto-union include/mysql.h: Auto merged include/mysql_com.h: Auto merged
Diffstat (limited to 'include/mysql.h')
-rw-r--r--include/mysql.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h
index becdf22067d..7e472a120b3 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -274,7 +274,8 @@ typedef struct st_mysql
my_bool free_me; /* If free in mysql_close */
my_ulonglong insert_id; /* id if insert on table with NEXTNR */
unsigned int last_errno;
- char *last_error;
+ char *last_error; /* Used by embedded server */
+ char sqlstate[SQLSTATE_LENGTH+1]; /* Used by embedded server */
} MYSQL;
#endif