diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-03-06 15:30:05 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-03-06 15:30:05 -0700 |
| commit | c2f48ff145526dd66f295ea14e1180455d936128 (patch) | |
| tree | 6cddd896ea59b3cd3e4edf90420fe05a94ed904d /libmysql | |
| parent | 3602e293a28a02a31aed0e30815db752c932f2f4 (diff) | |
| parent | 5fdfea0023e9d6cda586568ab5ae216c4c81c31c (diff) | |
| download | mariadb-git-c2f48ff145526dd66f295ea14e1180455d936128.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/maint/mar05/50
into siva.hindu.god:/home/tsmith/m/bk/maint/mar05/51
libmysql/libmysql.c:
Auto merged
sql/sql_class.cc:
Auto merged
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 3ca09cb68ea..181904edc1a 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1361,7 +1361,7 @@ mysql_stat(MYSQL *mysql) { DBUG_ENTER("mysql_stat"); if (simple_command(mysql,COM_STATISTICS,0,0,0)) - return mysql->net.last_error; + DBUG_RETURN(mysql->net.last_error); DBUG_RETURN((*mysql->methods->read_statistics)(mysql)); } |