summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2007-03-19 11:19:51 +0200
committerunknown <jani@ua141d10.elisa.omakaista.fi>2007-03-19 11:19:51 +0200
commit3615debeb1377b1ddf51b546ed7342186c18db59 (patch)
tree9a5138fc2c9b3da679d046cb6fd0419bb6f5042b /include
parent8deff6b0c6b1b43e1565e0a59b1b2f1ac765e8b1 (diff)
downloadmariadb-git-3615debeb1377b1ddf51b546ed7342186c18db59.tar.gz
Added find_type_or_exit and find_bit_type_or_exit as wrappers
around the original functions. These will ensure that error message is always in unique form, reduce code and print the right alternatives automatically in an error case. client/mysql.cc: Changed find_type to find_type_or_exit client/mysqladmin.cc: Changed find_type to find_type_or_exit client/mysqlbinlog.cc: Changed find_type to find_type_or_exit client/mysqlcheck.c: Changed find_type to find_type_or_exit client/mysqldump.c: Changed find_type to find_type_or_exit client/mysqlimport.c: Changed find_type to find_type_or_exit client/mysqlshow.c: Changed find_type to find_type_or_exit client/mysqlslap.c: Changed find_type to find_type_or_exit include/typelib.h: Added find_type_or_exit mysql-test/r/mysql_protocols.result: Fixed result. mysys/typelib.c: Added find_type_or_exit sql/mysqld.cc: Added use of find_type_or_exit and find_bit_type_or_exit Fixed a missing break; from an option handling. (Bug in --tc-heuristic-recover)
Diffstat (limited to 'include')
-rw-r--r--include/typelib.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/typelib.h b/include/typelib.h
index 75d170e59d3..c973d1747fd 100644
--- a/include/typelib.h
+++ b/include/typelib.h
@@ -26,6 +26,8 @@ typedef struct st_typelib { /* Different types saved here */
unsigned int *type_lengths;
} TYPELIB;
+extern int find_type_or_exit(const char *x, TYPELIB *typelib,
+ const char *option);
extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name);
extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);
extern const char *get_type(TYPELIB *typelib,unsigned int nr);