diff options
author | unknown <monty@mysql.com> | 2006-06-19 12:45:34 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2006-06-19 12:45:34 +0300 |
commit | 4b316e6fd68a83421dffa5cf1d2add78bb8c8e65 (patch) | |
tree | b1eef84ec3b6195237d928b1ebea0aaa0acf90a7 /sql/sql_string.cc | |
parent | 7f19b1cc05adb189de29ce4475f6539ec1ac4d09 (diff) | |
download | mariadb-git-4b316e6fd68a83421dffa5cf1d2add78bb8c8e65.tar.gz |
unsigned char -> uchar
Added missing copyright
Indentation and prototype fixes
Fixed compiler warning
include/my_sys.h:
Fix prototype for my_print_open_files.
Indentation fixes
mysys/mf_keycache.c:
Fix that key cache can be compiled without #define THREAD
mysys/my_error.c:
Indentation cleanups
mysys/my_memmem.c:
Added missing copyright.
Fix include files
sql/event.cc:
unsigned char -> uchar
sql/field.cc:
unsigned char -> uchar
sql/filesort.cc:
Indentation fix
sql/ha_ndbcluster.cc:
unsigned char -> uchar
sql/ha_ndbcluster_binlog.cc:
unsigned char -> uchar
sql/item_strfunc.cc:
unsigned char -> uchar
sql/log_event.cc:
unsigned char -> uchar
sql/opt_range.cc:
Indentation fixes
sql/sql_crypt.cc:
unsigned char -> uchar
sql/sql_string.cc:
unsigned char -> uchar
sql/tztime.cc:
unsigned char -> uchar
storage/heap/hp_extra.c:
Clear also next_block (See heap_scan_init)
storage/heap/hp_test2.c:
Set required struct memeber max_table_size
(Fixes that hp_test2 works again)
storage/myisam/mi_rsamepos.c:
Fixed bug in mi_rsame_with_pos
strings/decimal.c:
Fixed compiler warning
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r-- | sql/sql_string.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 19ee9f259dc..596f4edadac 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -720,8 +720,8 @@ void String::qs_append(uint i) int sortcmp(const String *s,const String *t, CHARSET_INFO *cs) { return cs->coll->strnncollsp(cs, - (unsigned char *) s->ptr(),s->length(), - (unsigned char *) t->ptr(),t->length(), 0); + (uchar *) s->ptr(),s->length(), + (uchar *) t->ptr(),t->length(), 0); } @@ -734,7 +734,7 @@ int sortcmp(const String *s,const String *t, CHARSET_INFO *cs) t Second string NOTE: - Strings are compared as a stream of unsigned chars + Strings are compared as a stream of uchars RETURN < 0 s < t |