Merge work:/home/bk/mysql-4.0 (3bcf1616) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+2 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ bell@sanja.is.com.ua
		davida@isil.mysql.com
		heikki@donna.mysql.fi
		heikki@hundin.mysql.fi
		jani@dsl-jkl1657.dial.inet.fi
		jani@hynda.mysql.fi
		jani@janikt.pp.saunalahti.fi
		jani@rhols221.adsl.netsonic.fi
		@@ -40,6 +41,7 @@ paul@teton.kitebird.com
		root@x3.internalnet
		sasha@mysql.sashanet.com
		serg@serg.mysql.com
		serg@sergbook.mysql.com
		sinisa@rhols221.adsl.netsonic.fi
		tfr@sarvik.tfr.cafe.ee
		tim@bitch.mysql.fi
		@@ -56,4 +58,3 @@ tonu@x3.internalnet
		venu@work.mysql.com
		zak@balfor.local
		zak@linux.local
		jani@dsl-jkl1657.dial.inet.fi

+1 −1

Original line number	Diff line number	Diff line
		--des-key-file=$MYSQL_TEST_DIR/std_data/des_key_file
		--loose-des-key-file=$MYSQL_TEST_DIR/std_data/des_key_file