summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <tsmith@maint2.mysql.com>2006-09-12 19:40:00 +0200
committerunknown <tsmith@maint2.mysql.com>2006-09-12 19:40:00 +0200
commitbc053aa0a1764220d3c0191f1293f78decfe7c4d (patch)
tree1a304e121de5b8b9285480986927f6230f33230d /libmysqld
parent9e89ea6fa8734c2538a416b29fc3120447f6b733 (diff)
parentf320b01a805637b4269a8a3aa3e9b5455995f58f (diff)
downloadmariadb-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 'libmysqld')
0 files changed, 0 insertions, 0 deletions