diff options
| author | unknown <anozdrin@mysql.com> | 2005-12-07 17:17:42 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2005-12-07 17:17:42 +0300 |
| commit | 943edab9a545c3a7bb3c55542b77f073ea21e91a (patch) | |
| tree | 763144b950b19c3f90be07331782b4e4629cfc1e /mysql-test/t/myisam.test | |
| parent | 9c8773f56338ad22419f8bb4587f935850814b9b (diff) | |
| parent | 6b2f13098a59d9ad520828dca4cb63da8c86b5e3 (diff) | |
| download | mariadb-git-943edab9a545c3a7bb3c55542b77f073ea21e91a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-sp-vars-merge-2
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sp_head.cc:
Merge.
Diffstat (limited to 'mysql-test/t/myisam.test')
0 files changed, 0 insertions, 0 deletions