diff options
| author | unknown <kostja@bodhi.local> | 2006-11-11 14:51:19 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-11 14:51:19 +0300 |
| commit | 5ae4c26e88939fcffd44953aca8bececbbcf3a7d (patch) | |
| tree | d766f0ab887eefd38ffb8ee547186e23afe1f081 /ndb/src/ndbapi/ndb_cluster_connection.cpp | |
| parent | 5f34139fff1fe8da33450b98d382bd356d7f78fa (diff) | |
| parent | aff0638b4d485372ab99501b10cb77ed22afc7a7 (diff) | |
| download | mariadb-git-5ae4c26e88939fcffd44953aca8bececbbcf3a7d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/time.cc:
Auto merged
mysql-test/t/rename.test:
Use local (resolve a conflict)
Diffstat (limited to 'ndb/src/ndbapi/ndb_cluster_connection.cpp')
0 files changed, 0 insertions, 0 deletions