diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-01-18 08:30:35 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-01-18 08:30:35 -0700 |
| commit | 61430c77a43d2b9bf8f5a928ca7977e96df0d1da (patch) | |
| tree | 43ed4a13aa6f4077a05dacedc68e38e0ace6b8be /BitKeeper | |
| parent | 8ca95b84281bd50685e7437fca3b06085f9cea56 (diff) | |
| parent | 1a0bd37c4d5741e7297f318da07d77767a537ca7 (diff) | |
| download | mariadb-git-61430c77a43d2b9bf8f5a928ca7977e96df0d1da.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
BUILD/check-cpu:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_enum.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Use remote (global 5.1 version)
sql/unireg.cc:
Use remote (5.1 global version)
mysql-test/t/trigger.test:
Manual merge
server-tools/instance-manager/guardian.cc:
Manual merge
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index a10f87c8529..96fa1623269 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,6 +15,8 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +452c6c6dAjuNghfc1ObZ_UQ5SCl85g +4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg 454a7ef8gdvE_ddMlJyghvOAkKPNOQ 454bb488ijVLOUK_GFjcoISE0GxPUA 454bb9a8AwlGRC_wWLS2sNMoRBMRGw @@ -30,3 +32,5 @@ 4561b2ecZbhuAc0TTDdCdultxUYaMw 4561bde4qWhz1I8tkItXKex5uniipA 4562ba016dYH0JzszOqZ8p6psbKfnQ +45771031yRCoM_ZfONdYchPvVEgLRg +45ae6628gqKTsUFfnoNExadETVIkbA |