diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-02-27 17:07:08 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-02-27 17:07:08 -0500 |
| commit | 5454146123e0d017b99c67ce715552cfd8dc87cb (patch) | |
| tree | b6b21f8b8534dfc76c8ca026056a3696710704f2 /BitKeeper | |
| parent | 9d66be72b0ee079cecc39e09d4f4c0f7e1849dbc (diff) | |
| parent | 89fd0e9f9e2fa26a3e46c5b48f278d395feba245 (diff) | |
| download | mariadb-git-5454146123e0d017b99c67ce715552cfd8dc87cb.tar.gz | |
Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-release/
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
BitKeeper/etc/collapsed:
auto-union
include/config-win.h:
Auto merged
myisam/mi_open.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
configure.in:
Manual merge. Verified "5.0.37".
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/t/information_schema.test:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/mysqld.cc:
Manual merge.
sql/sql_select.cc:
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 8dcf561b845..64dfcb27d17 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -35,9 +35,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 |