diff options
| author | unknown <lzhou/zhl@dev3-63.(none)> | 2007-02-01 17:34:20 +0000 |
|---|---|---|
| committer | unknown <lzhou/zhl@dev3-63.(none)> | 2007-02-01 17:34:20 +0000 |
| commit | d760847276059930913c5b3837fb253b936a7173 (patch) | |
| tree | 43d2528007f225d8a978b925a4b0ae1c88ca5e47 /sql/sql_error.h | |
| parent | 4415af757e9bb64e76e4f0fb8fa7f1b498221282 (diff) | |
| parent | b4f04231db5d7922ec60be1a747a052bd7880d44 (diff) | |
| download | mariadb-git-d760847276059930913c5b3837fb253b936a7173.tar.gz | |
Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bj
into dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb
sql/log_event.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/slave.cc:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
Diffstat (limited to 'sql/sql_error.h')
0 files changed, 0 insertions, 0 deletions