Merge may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1

Browse source

into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0


mysql-test/r/grant.result:
  Manual merge: use local.
mysql-test/t/grant.test:
  Manual merge: use local.
sql/sql_update.cc:
  Manual merge: use local.

...

This commit is contained in:

unknown 2006-08-11 14:24:09 +05:00

parent 12eb42acf9 dba52b539a

commit 145dd58d3c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available