diff options
| author | unknown <dlenev@mysql.com> | 2005-12-24 20:13:51 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-12-24 20:13:51 +0300 |
| commit | eff9369d10cf1bbb5fc2dcbe46aef3e3cc88797a (patch) | |
| tree | 98fa99bfff1491e01070d24e8d05941d68a44ee3 /vio | |
| parent | 81ca15813bfc482ac98614de41a867e47dde07d3 (diff) | |
| parent | 9ae226fe41576390b48141205619223eb4cdde4b (diff) | |
| download | mariadb-git-eff9369d10cf1bbb5fc2dcbe46aef3e3cc88797a.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836
into mysql.com:/home/dlenev/src/mysql-5.1-merges
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/tools/ndb_size.pl:
Auto merged
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/t/information_schema.test:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
Diffstat (limited to 'vio')
0 files changed, 0 insertions, 0 deletions