diff options
| author | unknown <joerg@trift-lap.none> | 2007-07-19 15:11:01 +0200 |
|---|---|---|
| committer | unknown <joerg@trift-lap.none> | 2007-07-19 15:11:01 +0200 |
| commit | bb00bbef1bf7bf75cd8499778e58b0e1b8484c4e (patch) | |
| tree | 39f3642d2cc60e951e7111e74065b0abe442615f /include | |
| parent | 17ccc0dd75b39c8d70aa5648d050690ae7cff376 (diff) | |
| parent | f4209c71a24ec563dd876db3a94fad7d2c53b8aa (diff) | |
| download | mariadb-git-bb00bbef1bf7bf75cd8499778e58b0e1b8484c4e.tar.gz | |
Merge trift-lap.none:/MySQL/M50/bug14151-5.0
into trift-lap.none:/MySQL/M51/bug14151-5.1
BitKeeper/deleted/.del-MySQL-Source.icc~edded3c3a5cf83b1:
Auto merged
BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b:
Auto merged
include/Makefile.am:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/my_md5.h (renamed from include/md5.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index b803f614a93..0796341cc91 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -33,7 +33,7 @@ noinst_HEADERS = config-win.h config-netware.h \ mysys_err.h my_base.h help_start.h help_end.h \ my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \ - thr_lock.h t_ctype.h violite.h md5.h base64.h \ + thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ mysql_version.h.in my_handler.h my_time.h \ my_vle.h my_user.h my_atomic.h atomic/nolock.h \ atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \ diff --git a/include/md5.h b/include/my_md5.h index f92976b3beb..f92976b3beb 100644 --- a/include/md5.h +++ b/include/my_md5.h |