diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-09-12 19:40:00 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-09-12 19:40:00 +0200 |
| commit | bc053aa0a1764220d3c0191f1293f78decfe7c4d (patch) | |
| tree | 1a304e121de5b8b9285480986927f6230f33230d /sql/protocol.cc | |
| parent | 9e89ea6fa8734c2538a416b29fc3120447f6b733 (diff) | |
| parent | f320b01a805637b4269a8a3aa3e9b5455995f58f (diff) | |
| download | mariadb-git-bc053aa0a1764220d3c0191f1293f78decfe7c4d.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg/g51
into maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51
libmysqld/libmysqld.def:
Auto merged
mysql-test/t/handler.test:
Auto merged
sql/log.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/protocol.cc')
0 files changed, 0 insertions, 0 deletions