summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-08-18 21:49:46 +0300
committerunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-08-18 21:49:46 +0300
commit496e86da3a2b0019a3d9c186063e2c4f56b2bb44 (patch)
tree4baf2c5eaa6e35708c1a5fad93e18c87d08dda36 /sql/log_event.cc
parentcd737f81c92d9921facad75e56c298a31cf1c871 (diff)
parent9b76bca8cf6dc34facb07c99428ea219fae037fb (diff)
downloadmariadb-git-496e86da3a2b0019a3d9c186063e2c4f56b2bb44.tar.gz
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 netware/BUILD/nwbootstrap: Auto merged sql/mysqld.cc: Auto merged include/config-netware.h: Manual merge from 4.0 to 4.1.
Diffstat (limited to 'sql/log_event.cc')
0 files changed, 0 insertions, 0 deletions