diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 10:36:04 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 10:36:04 +0200 |
| commit | 70255e85094e27597de49c404a867ad48b7e7bc3 (patch) | |
| tree | bcfe3c1689f5158834701b1dd5acdb6ccfe1b3b9 /mysql-test/r/user_limits.result | |
| parent | c316933e602dbd8144e13254bc517f4e108032c3 (diff) | |
| parent | ca5e29475c8ae52035214c710be04bcb1ed13177 (diff) | |
| download | mariadb-git-70255e85094e27597de49c404a867ad48b7e7bc3.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/r/user_limits.result')
0 files changed, 0 insertions, 0 deletions