diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-04-27 16:45:01 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-04-27 16:45:01 -0400 |
| commit | 4687fe01d7e3ff566e045b1f538562412f4f4c00 (patch) | |
| tree | dc6a3a60b71e4a3cbaadb6dc739d736ab8014ac5 /BitKeeper | |
| parent | 3a58af9c0db3a3e34453fe1689ca4287be9b396a (diff) | |
| parent | 1698b4f2ddbb61aa4f3ad69e941bac688822d00d (diff) | |
| download | mariadb-git-4687fe01d7e3ff566e045b1f538562412f4f4c00.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02
BitKeeper/etc/collapsed:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
include/config-win.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/mysqlcheck.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/mysqlcheck.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
include/my_dbug.h:
Manual merge.
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/r/information_schema_db.result:
Manual merge.
mysql-test/r/mysqlshow.result:
Manual merge.
sql/Makefile.am:
Manual merge.
sql/lex.h:
Manual merge.
sql/lock.cc:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/mysqld.cc:
Manual merge.
sql/set_var.cc:
Manual merge.
sql/slave.cc:
Manual merge.
sql/sql_base.cc:
Manual merge.
sql/sql_delete.cc:
Manual merge.
sql/sql_insert.cc:
Manual merge.
sql/sql_lex.h:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_select.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_update.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
sql/structs.h:
Manual merge.
sql/table.h:
Manual merge.
storage/archive/ha_archive.cc:
Manual merge.
storage/ndb/src/common/util/File.cpp:
Manual merge.
storage/ndb/src/ndbapi/DictCache.cpp:
Manual merge.
support-files/mysql.spec.sh:
Manual merge.
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 842482e46d5..34584f04c01 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -38,9 +38,25 @@ 459a70691aYIfU2ohV0a3P5iTLpO2A 459a7422KF_P7PuU3YQ5qG6ZLEVpiA 459a74e4nRcXppMSBYeQQ5efDkTADg +459c03b9N_mqF2XJKK6DwSrIt7e6_g +459c1965_BQMBzBO8S_gVqjTHYQrmw +459c2098XoAUsUn8N07IVRDD6CTM-A +459ea845XenN-uWqEM5LFvUT60tW_A 45ae6628gqKTsUFfnoNExadETVIkbA +45af88c9RIIJWPfBxs3o7zekI-ELPQ 45ba4faf2oqu6eR8fqecR3LfSNcYUg 45ba5238-NKl80QVXzdGo8hO9M75Xg 45c0fdfb2mz6NdOIsLenJtf6_ZelTA +45c38d90tNwOTSaYKHXd3ccLtnytlQ +45c390d6BbWrwyEi5T5VsWKYxl06Rg +45c39d31g0iik6UE_oTK5N55ry-ycA 45d1ffcd-r3v8A7uh92hQaMfQM9UPQ 45d21437Vg_-i4uOWyvzYWHESXDP6A +45da6370nnZlAAIieMCrXkxF9toOyQ +45da6551zUuplwxuqcT2fhRgceC0CQ +45db0d4bkGtxBk21sZFJgbCV1FcNRg +45db468b-DKE8kUTV42eYMYmk8_g9g +45dd21d1rVPnDfvZTNVHLalcjnbsZw +45ddaf15_Ld7IAEpUUP3FJjJ-oSEFg +45ddc763DodLG1BqH_wRBJXMbCSB5A +45ddc8282KnaNGuijqCTphlXV_eeog |