diff options
| author | unknown <serg@janus.mylan> | 2007-12-27 17:30:59 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-12-27 17:30:59 +0100 |
| commit | c1350b873165429f06b061565b91a0d423e39bdb (patch) | |
| tree | 6fb6953a69411105f5728d3577d344f246f280fe /mysys/make-conf.c | |
| parent | cd7b1fd9eb325f7af88f825cf1f00a15d005645c (diff) | |
| parent | c8f6457f650845ab1f9e04b2136b8351e4d465aa (diff) | |
| download | mariadb-git-c1350b873165429f06b061565b91a0d423e39bdb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysys/make-conf.c')
0 files changed, 0 insertions, 0 deletions