diff options
| author | kaa@kaamos.(none) <> | 2008-03-12 11:19:46 +0300 |
|---|---|---|
| committer | kaa@kaamos.(none) <> | 2008-03-12 11:19:46 +0300 |
| commit | 0a7052e4d3633b818ab4050adcad646b888c5430 (patch) | |
| tree | f84e4ada799bf37a3d9ef074064f8a17f408aa89 /libmysql | |
| parent | d4025ce1a60322635bf5f7adb765f4612563ee3a (diff) | |
| parent | 7e365efa30f5d42aaf87ce9044176e266ee337eb (diff) | |
| download | mariadb-git-0a7052e4d3633b818ab4050adcad646b888c5430.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.1
into kaamos.(none):/data/src/opt/mysql-5.1-opt
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index d79910a2ef4..13ccd5749a3 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1500,7 +1500,7 @@ my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql) const char *STDCALL mysql_sqlstate(MYSQL *mysql) { - return mysql->net.sqlstate; + return mysql ? mysql->net.sqlstate : cant_connect_sqlstate; } uint STDCALL mysql_warning_count(MYSQL *mysql) |