diff options
| author | unknown <guilhem@gbichot4.local> | 2008-02-18 23:36:57 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-02-18 23:36:57 +0100 |
| commit | a94d5d53c2383f2743f316bad9505af053e22e7c (patch) | |
| tree | eb84c87b6b3703ffc18f62934e35f2c3a7986c4a /libmysql | |
| parent | 9c09c049fb1de31060e48e757d0cc57db0b07838 (diff) | |
| parent | e2103aafa0e93d68c79a3ebab2d3a755e039a3d2 (diff) | |
| download | mariadb-git-a94d5d53c2383f2743f316bad9505af053e22e7c.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
client/mysqltest.c:
Auto merged
include/my_sys.h:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index f5ac1c09248..06eae528574 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -3388,7 +3388,7 @@ static void read_binary_time(MYSQL_TIME *tm, uchar **pos) if (length) { uchar *to= *pos; - tm->neg= (bool) to[0]; + tm->neg= to[0]; tm->day= (ulong) sint4korr(to+1); tm->hour= (uint) to[5]; @@ -4218,7 +4218,7 @@ static my_bool is_binary_compatible(enum enum_field_types type1, for (range= range_list; range != range_list_end; ++range) { /* check that both type1 and type2 are in the same range */ - bool type1_found= FALSE, type2_found= FALSE; + my_bool type1_found= FALSE, type2_found= FALSE; for (type= *range; *type != MYSQL_TYPE_NULL; type++) { type1_found|= type1 == *type; |