mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
This commit is contained in:
commit
ac6c4f6cb7
2 changed files with 3 additions and 2 deletions
|
|
@ -11,6 +11,7 @@ bell@sanja.is.com.ua
|
||||||
davida@isil.mysql.com
|
davida@isil.mysql.com
|
||||||
heikki@donna.mysql.fi
|
heikki@donna.mysql.fi
|
||||||
heikki@hundin.mysql.fi
|
heikki@hundin.mysql.fi
|
||||||
|
jani@dsl-jkl1657.dial.inet.fi
|
||||||
jani@hynda.mysql.fi
|
jani@hynda.mysql.fi
|
||||||
jani@janikt.pp.saunalahti.fi
|
jani@janikt.pp.saunalahti.fi
|
||||||
jani@rhols221.adsl.netsonic.fi
|
jani@rhols221.adsl.netsonic.fi
|
||||||
|
|
@ -40,6 +41,7 @@ paul@teton.kitebird.com
|
||||||
root@x3.internalnet
|
root@x3.internalnet
|
||||||
sasha@mysql.sashanet.com
|
sasha@mysql.sashanet.com
|
||||||
serg@serg.mysql.com
|
serg@serg.mysql.com
|
||||||
|
serg@sergbook.mysql.com
|
||||||
sinisa@rhols221.adsl.netsonic.fi
|
sinisa@rhols221.adsl.netsonic.fi
|
||||||
tfr@sarvik.tfr.cafe.ee
|
tfr@sarvik.tfr.cafe.ee
|
||||||
tim@bitch.mysql.fi
|
tim@bitch.mysql.fi
|
||||||
|
|
@ -56,4 +58,3 @@ tonu@x3.internalnet
|
||||||
venu@work.mysql.com
|
venu@work.mysql.com
|
||||||
zak@balfor.local
|
zak@balfor.local
|
||||||
zak@linux.local
|
zak@linux.local
|
||||||
jani@dsl-jkl1657.dial.inet.fi
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
--des-key-file=$MYSQL_TEST_DIR/std_data/des_key_file
|
--loose-des-key-file=$MYSQL_TEST_DIR/std_data/des_key_file
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue