diff options
| author | unknown <marty@linux.site> | 2005-06-30 12:20:52 +0200 |
|---|---|---|
| committer | unknown <marty@linux.site> | 2005-06-30 12:20:52 +0200 |
| commit | 7a5ec7606d9cf70697484df7c235341bc574b4a0 (patch) | |
| tree | d61554cba3c2aa34bee31d02127690c317681d2a /sql/protocol.h | |
| parent | fd34694dc840993537692c10207c8a9d571cf515 (diff) | |
| parent | 9996c3d8f1ec01198afb54c8fbf852f5d8ed2d05 (diff) | |
| download | mariadb-git-7a5ec7606d9cf70697484df7c235341bc574b4a0.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into linux.site:/home/marty/MySQL/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/default.c:
Auto merged
ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'sql/protocol.h')
0 files changed, 0 insertions, 0 deletions