diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-15 11:25:02 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-15 11:25:02 -0400 |
| commit | 39f28ab6c5c92eca8761359835acd81b5fb73a6f (patch) | |
| tree | 223c8cb9f532208d7cad18dcd9c8d3c006b77e70 /BitKeeper | |
| parent | 91a1db9ddaad317e4daeffff4cc27e7a7f068fec (diff) | |
| parent | 9e1a6b0eeffddc890d8e6d905cb72460298ed86d (diff) | |
| download | mariadb-git-39f28ab6c5c92eca8761359835acd81b5fb73a6f.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/config:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/Makefile.am:
Auto merged
vio/viosocket.c:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config index 6d06edd193e..1a027813ff4 100644 --- a/BitKeeper/etc/config +++ b/BitKeeper/etc/config @@ -75,5 +75,6 @@ hours: [tomas:]checkout:get [guilhem:]checkout:get [pekka:]checkout:get +[msvensson:]checkout:get checkout:edit eoln:unix |