Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/set_var.h:
  Auto merged
This commit is contained in:
unknown 2007-01-26 14:47:35 -05:00
commit 48b8edc2ad
3 changed files with 43 additions and 35 deletions

View file

@ -31,3 +31,5 @@
4558b3d73Cxjlb7Wv1oytdSTthxDfw
45771031yRCoM_ZfONdYchPvVEgLRg
45ae6628gqKTsUFfnoNExadETVIkbA
45ba4faf2oqu6eR8fqecR3LfSNcYUg
45ba5238-NKl80QVXzdGo8hO9M75Xg