diff options
| author | unknown <monty@mysql.com> | 2005-10-12 00:59:52 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-10-12 00:59:52 +0300 |
| commit | 706157f025c8bfe01faa3783a54eecb8884b0d3f (patch) | |
| tree | 7613691c50c9b918d5dbcb5683e2672e06db2a71 /include | |
| parent | 4857e205a3fbe7d533af70028adf7ee8868a174e (diff) | |
| parent | 0ce12f70ed2eee1b92e2af27e7dda30db544f492 (diff) | |
| download | mariadb-git-706157f025c8bfe01faa3783a54eecb8884b0d3f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_manager.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 1 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 422bd171eb5..f7b85916abf 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -98,7 +98,6 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_RETURN_REAL_PATH 32 /* return full path for file */ #define MY_SAFE_PATH 64 /* Return NULL if too long path */ #define MY_RELATIVE_PATH 128 /* name is relative to 'dir' */ -#define MY_UNIX_PATH 256 /* convert path to UNIX format */ /* My seek flags */ #define MY_SEEK_SET 0 diff --git a/include/mysql_com.h b/include/mysql_com.h index c4eb33a6c9a..1e595cdbba3 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -409,7 +409,7 @@ my_bool check_scramble(const char *reply, const char *message, const unsigned char *hash_stage2); void get_salt_from_password(unsigned char *res, const char *password); void make_password_from_salt(char *to, const unsigned char *hash_stage2); -void octet2hex(char *to, const unsigned char *str, unsigned int len); +char *octet2hex(char *to, const char *str, unsigned int len); /* end of password.c */ |