diff options
| author | unknown <lenz@mysql.com> | 2003-03-18 22:14:02 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2003-03-18 22:14:02 +0100 |
| commit | f04be0b9c5621b95c6e0f4d8b113ca919201fc08 (patch) | |
| tree | 92beef04c0b6256679ee496d44e0187ab6809cb8 /libmysqld/Makefile.am | |
| parent | 71aa1f6d56130ff37912d7182e9f1039133f9347 (diff) | |
| download | mariadb-git-f04be0b9c5621b95c6e0f4d8b113ca919201fc08.tar.gz | |
- renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
- cleanup: removed client/password.c (not used at all) and
libmysql/password.c (should rather be a symlink to sql/password.c instead)
- applied HPUX11 portability fix for char_val declaration to sql/password.c
(taken from libmysql/password.c)
BitKeeper/deleted/.del-password.c~c036d4f8b3280843:
Delete: client/password.c
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
Delete: libmysql/password.c
include/mysql_com.h:
- replaced "rnd" with "my_rnd"
libmysql/Makefile.am:
- removed dead piece of code ($qs was not defined)
- symlink password.c from the sql directory
libmysqld/Makefile.am:
- use password.c from the sql directory instead
sql/item_func.cc:
- replaced "rnd" with "my_rnd"
sql/mysqld.cc:
- replaced "rnd" with "my_rnd"
sql/password.c:
- replaced "rnd" with "my_rnd"
sql/sql_class.cc:
- replaced "rnd" with "my_rnd"
sql/sql_crypt.cc:
- replaced "rnd" with "my_rnd"
Diffstat (limited to 'libmysqld/Makefile.am')
| -rw-r--r-- | libmysqld/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 7bd9127a7f0..d831d2a7a5a 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -33,14 +33,14 @@ noinst_LIBRARIES = libmysqld_int.a pkglib_LIBRARIES = libmysqld.a SUBDIRS = . examples libmysqld_sources= libmysqld.c lib_sql.cc -libmysqlsources = errmsg.c get_password.c password.c +libmysqlsources = errmsg.c get_password.c noinst_HEADERS = embedded_priv.h sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ ha_innodb.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \ ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \ - hostname.cc init.cc \ + hostname.cc init.cc password.c \ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ item_uniq.cc key.cc lock.cc log.cc log_event.cc mf_iocache.cc\ |