diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-01-26 13:11:10 -0800 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-01-26 13:11:10 -0800 |
| commit | a5f695ad309269c01c82a373cbbb81e067ee40b8 (patch) | |
| tree | 360868f2faebaa99cf32b37935a54bf7b37ff19b /BitKeeper | |
| parent | 4c7aeb3676ba1a284f0e18ea1ef00b19a72f3c84 (diff) | |
| parent | 74162c7774cc44ece69e3b862ea8914d9bb765ab (diff) | |
| download | mariadb-git-a5f695ad309269c01c82a373cbbb81e067ee40b8.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
BitKeeper/etc/collapsed:
auto-union
Makefile.am:
Merged in changes from 5.0
mysql-test/r/range.result:
Merged in changes from 5.0
mysys/default.c:
Merged in changes from 5.0. Not reverting this change.
scripts/mysql_create_system_tables.sh:
Merged in changes from 5.0
scripts/mysqld_multi.sh:
Merged in changes from 5.0. Not reverting this change.
sql/item.cc:
Merged in changes from 5.0
sql/mysql_priv.h:
Merged in changes from 5.0
sql/set_var.h:
Merged in changes from 5.0
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 96fa1623269..d16baafda14 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -34,3 +34,5 @@ 4562ba016dYH0JzszOqZ8p6psbKfnQ 45771031yRCoM_ZfONdYchPvVEgLRg 45ae6628gqKTsUFfnoNExadETVIkbA +45ba4faf2oqu6eR8fqecR3LfSNcYUg +45ba5238-NKl80QVXzdGo8hO9M75Xg |