Commits · 2173f6d76f707bc71cd141879691e17d55b95a39 · nexedi / MariaDB

20 Apr, 2007 6 commits

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian · 2173f6d7
unknown authored Apr 20, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian
```
2173f6d7
Change mode to -rw-rw-r-- · 3bf8b48e
unknown authored Apr 19, 2007

3bf8b48e
Made default changelog a little more generic. · 855cb380
unknown authored Apr 19, 2007

855cb380

control.in: · 30101641

unknown authored Apr 20, 2007

  Left a stray space in. 


debian/control.in:
  Left a stray space in.

30101641

Makefile.am: · d7693a02

unknown authored Apr 20, 2007

  Renamed libmysqlclient package entires 


debian/Makefile.am:
  Renamed libmysqlclient package entires

d7693a02

libmysqlclientSLIBoff.README.Debian.in: · 35fee543

unknown authored Apr 20, 2007

  Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
libmysqlclientSLIBoff.docs.in:
  Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
control.in:
  Renamed packages back to libmysqlclientSLIBoff to match current packages. 
  We can rename this in a sensible way later on. 
libmysqlclientSLIBoff.files.in:
  Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
libmysqlclientSLIBoff.dirs.in:
  Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
libmysqlclientSLIBoff.postinst.in:
  Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in


debian/libmysqlclientSLIBoff.README.Debian.in:
  Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
debian/libmysqlclientSLIBoff.dirs.in:
  Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
debian/libmysqlclientSLIBoff.docs.in:
  Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
debian/libmysqlclientSLIBoff.files.in:
  Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
debian/libmysqlclientSLIBoff.postinst.in:
  Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in
debian/control.in:
  Renamed packages back to libmysqlclientSLIBoff to match current packages. 
  We can rename this in a sensible way later on.

35fee543

19 Apr, 2007 2 commits

rules: · 33855978

unknown authored Apr 19, 2007

  Protect the control file from running ./configure again


debian/rules:
  Protect the control file from running ./configure again

33855978

control.in: · 506ef8f2

unknown authored Apr 19, 2007

  Fixed branding problem.
Many files:
  Fixed branding problem
changelog:
  Upgraded to 5.0.42
defs.mk.in:
  Fixed branding and variable persiting problem.


debian/changelog:
  Upgraded to 5.0.42
debian/control.in:
  Fixed branding problem.
debian/defs.mk.in:
  Fixed branding and variable persiting problem.
debian/mysql-client-BASE.files.in:
  Fixed branding problem
debian/mysql-client-BASE.lintian-overrides.in:
  Fixed branding problem
debian/mysql-server-BASE.config.in:
  Fixed branding problem
debian/mysql-server-BASE.files.in:
  Fixed branding problem
debian/mysql-server-BASE.lintian-overrides.in:
  Fixed branding problem
debian/mysql-server-BASE.postinst.in:
  Fixed branding problem
debian/mysql-server-BASE.postrm.in:
  Fixed branding problem
debian/mysql-server-BASE.templates.in:
  Fixed branding problem
debian/rules:
  Fixed branding problem
debian/source.lintian-overrides.in:
  Fixed branding problem
debian/po/POTFILES.in.in:
  Fixed branding problem

506ef8f2

18 Apr, 2007 28 commits

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint · d6e07dc2

unknown authored Apr 18, 2007

into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint


Makefile.am:
  Auto merged
configure.in:
  Auto merged

d6e07dc2

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2 · d429061d
unknown authored Apr 18, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint


configure.in:
  Auto merged
```
d429061d

Fixed make distcheck problem. · ad4922ef

unknown authored Apr 18, 2007


Makefile.am:
  Removed debian/control creation from the top level dist-hook
configure.in:
  Create debian/control from configure again
debian/rules:
  Protect debian/control from the debuild distclean run. 
  Prevent a makefile variable loop when settin MYSQL_BASE_VERSION

ad4922ef

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 9508b781
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/Makefile.am:
  Auto merged
```
9508b781
Add CMakeLists.txt to EXTRA_DIST · b4573eb4
unknown authored Apr 18, 2007

b4573eb4
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 214d2d1c
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
```
214d2d1c
Remove the check for value_start(if any it should be *value_start) · 1f949e08
unknown authored Apr 18, 2007

1f949e08

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 7eae11ad

unknown authored Apr 18, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged

7eae11ad

Use my_snprintf instead of snprintf · 87a05adf
unknown authored Apr 18, 2007

87a05adf
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 29b61191
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
29b61191
Use my_snprintf instead of snprintf · aa043d73
unknown authored Apr 18, 2007

aa043d73
Add scripts/ subdiretory · c297a723
unknown authored Apr 18, 2007

c297a723

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 406233b6

unknown authored Apr 18, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged

406233b6

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 5a144fcd
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
5a144fcd
Use mysqltest builtin $MYSQL_SERVER_VERSIOn to mask version that mysql_upgrade reports · 551b1d50
unknown authored Apr 18, 2007

551b1d50
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 1196531a
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
1196531a
Add mysql builtin $MYSQL_SERVER_VERSION and some function to make · 4dc441d3
unknown authored Apr 18, 2007
```
it easier to set a variable from string or int 
```
4dc441d3
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 51f179b6
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
```
51f179b6
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 1c6ed4bc
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
```
1c6ed4bc

Update mysql_upgrade tests for 5.1 · 07ec45cc

unknown authored Apr 18, 2007

Add "two liner" to mysqld --bootstrap that allows
wo write scripts that can be run both by mysql and mysqld --bootstrap
Remove duplicate create of MySQL system tables 


mysql-test/r/mysql_upgrade.result:
  Update mysql_upgrade.result for new tables in 5.1
scripts/mysql_system_tables.sql:
  Use "delimiter ;;" to make it possible to run the script
  both with "mysql" and "mysqld --bootstrap"
scripts/mysql_system_tables_fix.sql:
  Remove duplicate stored procedure for creating slow_log
  and general_log.
  Remove duplicate CREATE of ndb_binlog_index.
  Those are already defined in mysql_system_tables.sql
sql/sql_parse.cc:
  Make "mysqld --bootstrap skip lines startig with "delimiter"
  thus making it possible to write sql scripts containing
  stored procedures that can be executed both  with "mysql" and
  "mysqld --bootstrap"

07ec45cc

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 6bfa5a40

unknown authored Apr 18, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
scripts/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
client/mysql_upgrade.c:
  Use remote
mysql-test/r/mysql_upgrade.result:
  Use remote
Makefile.am:
  Merge "build scripts/ a little earlier"
include/my_global.h:
  Merge

6bfa5a40

Make it possible to define how many slaves to start by · 5c911775
unknown authored Apr 18, 2007
```
writing --slave-num=n in <testname>-master.opt file 
```
5c911775

Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade · 5eab19d7

unknown authored Apr 18, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
CMakeLists.txt:
  Auto merged
Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged

5eab19d7

Bug#25452 mysql_upgrade access denied · 1d24597f

unknown authored Apr 18, 2007

 - Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405


BitKeeper/etc/ignore:
  Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list
CMakeLists.txt:
  Build files also in scripts/
Makefile.am:
  Build scripts/ a little earlier to make
  the scripts/mysql_fix_privilege_tables_sql.c file available
  when client/ is built
client/mysql_upgrade.c:
  Updated version of mysql_upgrade with comments and logical functions
include/my_global.h:
  Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
mysql-test/r/mysql_upgrade.result:
  Update result
mysql-test/t/mysql_upgrade.test:
  Add more tests for different bugs related to mysql_upgrade
scripts/Makefile.am:
  Build comp_sql and mysql_fix_privilege_tables_sql.c
sql/mysql_priv.h:
  Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
scripts/CMakeLists.txt:
  New BitKeeper file ``scripts/CMakeLists.txt''
scripts/comp_sql.c:
  New BitKeeper file ``scripts/comp_sql.c''

1d24597f

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint · 4e6e8a39

unknown authored Apr 17, 2007

into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint


Makefile.am:
  Auto merged
configure.in:
  Auto merged

4e6e8a39

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2 · ff2e7f45
unknown authored Apr 17, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint


configure.in:
  SCCS merged
```
ff2e7f45
Changed a comment to be more clear. · 3b2b2d88
unknown authored Apr 17, 2007

3b2b2d88

BUG#27769 - MySQL should include debian packaging dir · 6d296e5e

unknown authored Apr 17, 2007

Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
BUG#27769 
Cleaned up some things to make building the packages go a little smoother. 
---
debian/rules really does need to be called from the source root.
---
Fixed two problems with the build caused by adding debian to the source tree
---
Left off the debian/ prefix to the Makefile filter.
---
BUG#27769 - MySQL should include debian packaging dir
Changed substitution variables to match already existing autoconf vars.
Generate debian/control and debian/defs.mk from autoconf now, since we run that
to make a source package. 
---
Corrected incorrect variable name
---
Renamed template files to have shorter names. 
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
A few final changes to make debs build from a source tarball dist. 


debian/libmysqlclientSLIB-dev.README.Maintainer.in:
  Rename: debian/libmysqlclientMYSOVER-dev.README.Maintainer.in -> debian/libmysqlclientSLIB-dev.README.Maintainer.in
debian/libmysqlclientSLIB-dev.dirs.in:
  Rename: debian/libmysqlclientMYSOVER-dev.dirs.in -> debian/libmysqlclientSLIB-dev.dirs.in
debian/libmysqlclientSLIB-dev.docs.in:
  Rename: debian/libmysqlclientMYSOVER-dev.docs.in -> debian/libmysqlclientSLIB-dev.docs.in
debian/libmysqlclientSLIB-dev.examples.in:
  Rename: debian/libmysqlclientMYSOVER-dev.examples.in -> debian/libmysqlclientSLIB-dev.examples.in
debian/libmysqlclientSLIB-dev.files.in:
  Rename: debian/libmysqlclientMYSOVER-dev.files.in -> debian/libmysqlclientSLIB-dev.files.in
debian/libmysqlclientSLIB-dev.links.in:
  Rename: debian/libmysqlclientMYSOVER-dev.links.in -> debian/libmysqlclientSLIB-dev.links.in
debian/libmysqlclientSLIB.README.Debian.in:
  Rename: debian/libmysqlclientMYSOVER.README.Debian.in -> debian/libmysqlclientSLIB.README.Debian.in
debian/libmysqlclientSLIB.dirs.in:
  Rename: debian/libmysqlclientMYSOVER.dirs.in -> debian/libmysqlclientSLIB.dirs.in
debian/libmysqlclientSLIB.docs.in:
  Rename: debian/libmysqlclientMYSOVER.docs.in -> debian/libmysqlclientSLIB.docs.in
debian/libmysqlclientSLIB.files.in:
  Rename: debian/libmysqlclientMYSOVER.files.in -> debian/libmysqlclientSLIB.files.in
debian/libmysqlclientSLIB.postinst.in:
  Rename: debian/libmysqlclientMYSOVER.postinst.in -> debian/libmysqlclientSLIB.postinst.in
debian/libndbclientNLIB-dev.dirs.in:
  Rename: debian/libndbclientNDBSOVER-dev.dirs.in -> debian/libndbclientNLIB-dev.dirs.in
debian/libndbclientNLIB-dev.files.in:
  Rename: debian/libndbclientNDBSOVER-dev.files.in -> debian/libndbclientNLIB-dev.files.in
debian/libndbclientNLIB-dev.links.in:
  Rename: debian/libndbclientNDBSOVER-dev.links.in -> debian/libndbclientNLIB-dev.links.in
debian/libndbclientNLIB.README.Debian.in:
  Rename: debian/libndbclientNDBSOVER.README.Debian.in -> debian/libndbclientNLIB.README.Debian.in
debian/libndbclientNLIB.dirs.in:
  Rename: debian/libndbclientNDBSOVER.dirs.in -> debian/libndbclientNLIB.dirs.in
debian/libndbclientNLIB.files.in:
  Rename: debian/libndbclientNDBSOVER.files.in -> debian/libndbclientNLIB.files.in
debian/libndbclientNLIB.postinst.in:
  Rename: debian/libndbclientNDBSOVER.postinst.in -> debian/libndbclientNLIB.postinst.in
debian/mysql-client-BASE.NEWS.in:
  Rename: debian/mysql-client-MYVER.NEWS.in -> debian/mysql-client-BASE.NEWS.in
debian/mysql-client-BASE.README.Debian.in:
  Rename: debian/mysql-client-MYVER.README.Debian.in -> debian/mysql-client-BASE.README.Debian.in
debian/mysql-client-BASE.dirs.in:
  Rename: debian/mysql-client-MYVER.dirs.in -> debian/mysql-client-BASE.dirs.in
debian/mysql-client-BASE.docs.in:
  Rename: debian/mysql-client-MYVER.docs.in -> debian/mysql-client-BASE.docs.in
debian/mysql-extra-BASE.dirs.in:
  Rename: debian/mysql-extra-MYVER.dirs.in -> debian/mysql-extra-BASE.dirs.in
debian/mysql-extra-BASE.files.in:
  Rename: debian/mysql-extra-MYVER.files.in -> debian/mysql-extra-BASE.files.in
debian/mysql-management-BASE.dirs.in:
  Rename: debian/mysql-management-MYVER.dirs.in -> debian/mysql-management-BASE.dirs.in
debian/mysql-management-BASE.files.in:
  Rename: debian/mysql-management-MYVER.files.in -> debian/mysql-management-BASE.files.in
debian/mysql-management-BASE.mysql-management.init.in:
  Rename: debian/mysql-management-MYVER.mysql-management.init.in -> debian/mysql-management-BASE.mysql-management.init.in
debian/mysql-server-BASE.NEWS.in:
  Rename: debian/mysql-server-MYVER.NEWS.in -> debian/mysql-server-BASE.NEWS.in
debian/mysql-server-BASE.README.Debian.in:
  Rename: debian/mysql-server-MYVER.README.Debian.in -> debian/mysql-server-BASE.README.Debian.in
debian/mysql-server-BASE.dirs.in:
  Rename: debian/mysql-server-MYVER.dirs.in -> debian/mysql-server-BASE.dirs.in
debian/mysql-server-BASE.docs.in:
  Rename: debian/mysql-server-MYVER.docs.in -> debian/mysql-server-BASE.docs.in
debian/mysql-server-BASE.links.in:
  Rename: debian/mysql-server-MYVER.links.in -> debian/mysql-server-BASE.links.in
debian/mysql-server-BASE.logcheck.ignore.paranoid.in:
  Rename: debian/mysql-server-MYVER.logcheck.ignore.paranoid.in -> debian/mysql-server-BASE.logcheck.ignore.paranoid.in
debian/mysql-server-BASE.logcheck.ignore.server.in:
  Rename: debian/mysql-server-MYVER.logcheck.ignore.server.in -> debian/mysql-server-BASE.logcheck.ignore.server.in
debian/mysql-server-BASE.logcheck.ignore.workstation.in:
  Rename: debian/mysql-server-MYVER.logcheck.ignore.workstation.in -> debian/mysql-server-BASE.logcheck.ignore.workstation.in
debian/mysql-server-BASE.mysql-server.logrotate.in:
  Rename: debian/mysql-server-MYVER.mysql-server.logrotate.in -> debian/mysql-server-BASE.mysql-server.logrotate.in
debian/mysql-server-BASE.preinst.in:
  Rename: debian/mysql-server-MYVER.preinst.in -> debian/mysql-server-BASE.preinst.in
debian/mysql-server-BASE.prerm.in:
  Rename: debian/mysql-server-MYVER.prerm.in -> debian/mysql-server-BASE.prerm.in
debian/mysql-server-PREV.preinst.in:
  Rename: debian/mysql-server-MYOLDVER.preinst.in -> debian/mysql-server-PREV.preinst.in
debian/mysql-storage-BASE.dirs.in:
  Rename: debian/mysql-storage-MYVER.dirs.in -> debian/mysql-storage-BASE.dirs.in
debian/mysql-storage-BASE.files.in:
  Rename: debian/mysql-storage-MYVER.files.in -> debian/mysql-storage-BASE.files.in
debian/mysql-storage-BASE.mysql-storage.init.in:
  Rename: debian/mysql-storage-MYVER.mysql-storage.init.in -> debian/mysql-storage-BASE.mysql-storage.init.in
debian/mysql-test-BASE.dirs.in:
  Rename: debian/mysql-test-MYVER.dirs.in -> debian/mysql-test-BASE.dirs.in
debian/mysql-test-BASE.files.in:
  Rename: debian/mysql-test-MYVER.files.in -> debian/mysql-test-BASE.files.in
debian/mysql-tools-BASE.dirs.in:
  Rename: debian/mysql-tools-MYVER.dirs.in -> debian/mysql-tools-BASE.dirs.in
debian/mysql-tools-BASE.files.in:
  Rename: debian/mysql-tools-MYVER.files.in -> debian/mysql-tools-BASE.files.in
Makefile.am:
  Moved generation of debian/control to dist-hook so make clean won't eat it.
  ---
  Need to generate the control file in the dist dir - not the source dir.
configure.in:
  Added variables to support the generation of debian/control and debian/defs.mk from configure
  ---
  Moved generation of debian/control to dist-hook so make clean won't eat it.
debian/Makefile.am:
  Distribute the generated control file so that debuild will work naturally.
  ---
  Broke the EXTRA_DIST line into separate lines. 
  Added defs.mk.in
  ---
  Modified debian/Makefile to use the new shorter template file names.
debian/control.in:
  Changed substitution variables to match already existing autoconf vars.
debian/defs.mk.in:
  Changed substitution variables to match already existing autoconf vars.
  Made defs.mk.in generated from template. 
  Persisted variables here. 
  ---
  Corrected incorrect variable name
debian/mysql-client-BASE.files.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-client-BASE.lintian-overrides.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.config.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.files.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.lintian-overrides.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postinst.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postrm.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.templates.in:
  Changed substitution variables to match already existing autoconf vars.
debian/po/POTFILES.in.in:
  Changed substitution variables to match already existing autoconf vars.
debian/rules:
  BUG#27769 - MySQL should include debian packaging dir
  Replaced hardcoded sover reference with variable.
  Removed references to added manpages.
  ---
  Prevented the test suite from being run unless requested. 
  ---
  Needed a space between ifneq and (
  ---
  The variable substitution was stepping on the Makefile from automake. 
  ---
  Left off the debian/ prefix to the Makefile filter.
  ---
  Changed substitution variables to match already existing autoconf vars.
  ---
  Save debian/defs.mk from make distclean
debian/source.lintian-overrides.in:
  Changed substitution variables to match already existing autoconf vars.

6d296e5e

17 Apr, 2007 4 commits
- Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 · 62e0d048
  unknown authored Apr 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/maint/51


configure.in:
  Use local
```
  62e0d048
- Merge siva.hindu.god:/home/tsmith/m/bk/maint/41 · 0f53cc79
  unknown authored Apr 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
```
  0f53cc79
- Merge siva.hindu.god:/home/tsmith/m/bk/50 · 633c1a65
  unknown authored Apr 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/maint/50


configure.in:
  Auto merged
```
  633c1a65
- Merge siva.hindu.god:/home/tsmith/m/bk/41 · 4e387d6c
  unknown authored Apr 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/maint/41
```
  4e387d6c