summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2000-11-17 02:36:46 +0200
committerunknown <monty@narttu.mysql.fi>2000-11-17 02:36:46 +0200
commit8f906f7790ac9041c9ee09cc9ac072d983fdb777 (patch)
tree09e51a2c4d96c3afa0d966f7469e46432fc6dc58 /sql/unireg.cc
parent24137ef26120c29263acda059d79e7c21fe59319 (diff)
downloadmariadb-git-8f906f7790ac9041c9ee09cc9ac072d983fdb777.tar.gz
Fixes for bugs in the usage of IO_CACHE
Docs/manual.texi: Fixed the TRUNCATE syntax + Changelog include/my_sys.h: Added my_b_vprintf mysys/mf_iocache2.c: Added my_b_vprintf mysys/my_vsnprintf.c: Fixed fatal (new) bug mysys/thr_lock.c: Cleanup readline/bind.c: cleanup scripts/Makefile.am: Added mysqldumpslow sql-bench/crash-me.sh: Fixed TRUNCATE sql/log.cc: bug fix sql/log_event.cc: Removed compiler warnings sql/log_event.h: Fixed non portable header in binary dump sql/mf_iocache.cc: cleanup sql/mysqld.cc: Fixed loop problem on NT sql/slave.cc: cleanup sql/sql_class.cc: Fixed typos sql/sql_parse.cc: cleanup sql/sql_select.cc: bugfix sql/sql_table.cc: cleanup sql/sql_yacc.yy: Changed ALTER TABLE ... ORDER BY to get fewer warnings sql/unireg.cc: cleanup sql/unireg.h: Added missing define
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 49f4a9fbfac..d02af0ef0d0 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -280,11 +280,11 @@ static uint pack_keys(uchar *keybuff,uint key_count,KEY *keyinfo)
}
/* Save keynames */
keyname_pos=pos;
- *pos++=NAMES_SEP_CHAR;
+ *pos++=(uchar) NAMES_SEP_CHAR;
for (key=keyinfo ; key != end ; key++)
{
uchar *tmp=(uchar*) strmov((char*) pos,key->name);
- *tmp++=NAMES_SEP_CHAR;
+ *tmp++= (uchar) NAMES_SEP_CHAR;
*tmp=0;
pos=tmp;
}
@@ -458,7 +458,7 @@ static bool pack_fields(File file,List<create_field> &create_fields)
}
/* Write fieldnames */
- buff[0]=NAMES_SEP_CHAR;
+ buff[0]=(uchar) NAMES_SEP_CHAR;
if (my_write(file,(byte*) buff,1,MYF_RW))
DBUG_RETURN(1);
i=0;