diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-04 19:11:55 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-04 19:11:55 +0100 |
| commit | dea988a04809c326a147935230f1ae5dfbc72fa2 (patch) | |
| tree | ac382a3e694ccbe7ed5a481331e35e4f055fdcae /BitKeeper/etc | |
| parent | 23b2d1d2c62b3a3fd94ea17e4728da82b0b2dc0a (diff) | |
| parent | a12fff7315effaecf741770665137e05f0a2e623 (diff) | |
| download | mariadb-git-dea988a04809c326a147935230f1ae5dfbc72fa2.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/collapsed:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
include/Makefile.am:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/lib/mtr_io.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/parser.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/parser.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/myisam/myisampack.c:
Auto merged
mysql-test/r/sp.result:
Manual merge
mysql-test/r/udf.result:
Manual merge
mysql-test/t/events_bugs.test:
Manual merge
sql/share/errmsg.txt:
Manual merge
support-files/mysql.spec.sh:
Manual merge
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/collapsed | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index f934fa44580..a10f87c8529 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -16,7 +16,17 @@ 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA 454a7ef8gdvE_ddMlJyghvOAkKPNOQ +454bb488ijVLOUK_GFjcoISE0GxPUA +454bb9a8AwlGRC_wWLS2sNMoRBMRGw +454c946ciQoR4dfTBZ0RTBmGJKp6lw +454f6e7eAnfLD9OCbGr5X9KiKvfKcQ +454f704bJiJy0_Nx2drY9P5kK3uOzg 454f8960jsVT_kMKJtZ9OCgXoba0xQ +454fa71cxshxszXJQYa9jbo0-_hAHw +4550b0ceIcozdgQhWFUTAtWkN196lA +4554a95d7txO1DuO9G3nAizI3SkFAA +4554b3722d71SbPiI2Gx-RhbZjmuIQ +4558b3d73Cxjlb7Wv1oytdSTthxDfw 4561b2ecZbhuAc0TTDdCdultxUYaMw 4561bde4qWhz1I8tkItXKex5uniipA 4562ba016dYH0JzszOqZ8p6psbKfnQ |