diff options
author | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:12 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:12 +0300 |
commit | 6b8e2938f21c508f67ec141256d1ffc77a935851 (patch) | |
tree | 2559697c56918e4fd2af81f84fcce0ea24dc60d4 /netware | |
parent | fb9a939416165321ff4f8b9dae29363671b84de9 (diff) | |
parent | dba3a0b03181126cfc46048396b96e5cd768fe5a (diff) | |
download | mariadb-git-6b8e2938f21c508f67ec141256d1ffc77a935851.tar.gz |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
Auto merged
BitKeeper/deleted/.del-mysql.xdc:
Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
Auto merged
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_mutex.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/log.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/my_vsnprintf.c:
Auto merged
sql/sql_parse.cc:
Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
Auto merged
Diffstat (limited to 'netware')
-rwxr-xr-x[-rw-r--r--] | netware/BUILD/create-patch | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/netware/BUILD/create-patch b/netware/BUILD/create-patch index 711eabf2d89..711eabf2d89 100644..100755 --- a/netware/BUILD/create-patch +++ b/netware/BUILD/create-patch |