diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2009-10-09 15:42:31 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2009-10-09 15:42:31 +0400 |
| commit | 92bd11a9b047f11675718d5a25986308951dc383 (patch) | |
| tree | f41c37e70a710461af1202bcf375e4b383868369 /libmysqld | |
| parent | 12516d0525b41a447fcf18bc7a3d38a742934320 (diff) | |
| parent | 5afc219d01fbf6a2f270aa70eadb64750c97e5e7 (diff) | |
| download | mariadb-git-92bd11a9b047f11675718d5a25986308951dc383.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2ac2556d4de..f01a6b3f3df 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -952,7 +952,7 @@ bool Protocol::send_fields(List<Item> *list, uint flags) client_field->catalog= dup_str_aux(field_alloc, "def", 3, cs, thd_cs); client_field->catalog_length= 3; - if (INTERNAL_NUM_FIELD(client_field)) + if (IS_NUM(client_field->type)) client_field->flags|= NUM_FLAG; if (flags & (int) Protocol::SEND_DEFAULTS) diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index aff9391e015..31ad8844650 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -99,7 +99,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, char name_buff[USERNAME_LENGTH]; DBUG_ENTER("mysql_real_connect"); - DBUG_PRINT("enter",("host: %s db: %s user: %s", + DBUG_PRINT("enter",("host: %s db: %s user: %s (libmysqld)", host ? host : "(Null)", db ? db : "(Null)", user ? user : "(Null)")); |