diff options
| author | unknown <monty@mysql.com> | 2006-06-19 13:00:36 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-19 13:00:36 +0300 |
| commit | cd3fa2ee7108be73fdc81ae663fd655e41762437 (patch) | |
| tree | e75191020187aa7951d311d8243bf28c5bbe307a /sql/ha_ndbcluster_binlog.cc | |
| parent | 9f8c532f0c7d8472cb809be6f80bb596d38b336b (diff) | |
| parent | 4b316e6fd68a83421dffa5cf1d2add78bb8c8e65 (diff) | |
| download | mariadb-git-cd3fa2ee7108be73fdc81ae663fd655e41762437.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
include/my_sys.h:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_string.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index a88d796dcbd..b4ea5fb0e80 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -138,7 +138,7 @@ static void print_records(TABLE *table, const char *record) for (int i= 0; i < n && pos < 20; i++) { - pos+= sprintf(&buf[pos]," %x", (int) (unsigned char) field_ptr[i]); + pos+= sprintf(&buf[pos]," %x", (int) (uchar) field_ptr[i]); } buf[pos]= 0; DBUG_PRINT("info",("[%u]field_ptr[0->%d]: %s", j, n, buf)); @@ -871,11 +871,11 @@ int ndbcluster_setup_binlog_table_shares(THD *thd) struct Cluster_schema { - unsigned char db_length; + uchar db_length; char db[64]; - unsigned char name_length; + uchar name_length; char name[64]; - unsigned char slock_length; + uchar slock_length; uint32 slock[SCHEMA_SLOCK_SIZE/4]; unsigned short query_length; char *query; @@ -974,7 +974,7 @@ static char *ndb_pack_varchar(const NDBCOL *col, char *buf, memcpy(buf, str, sz); break; case NDBCOL::ArrayTypeShortVar: - *(unsigned char*)buf= (unsigned char)sz; + *(uchar*)buf= (uchar)sz; memcpy(buf + 1, str, sz); break; case NDBCOL::ArrayTypeMediumVar: |