diff options
author | unknown <igor@rurik.mysql.com> | 2005-11-15 23:01:29 -0800 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2005-11-15 23:01:29 -0800 |
commit | 1cb17d45ce21d797f6537831acc666f6a93e91e5 (patch) | |
tree | cc7a40303934e7c923826740aafe6c7a7b3e7af6 /mysql-test/r/rpl_sp.result | |
parent | 9de8e3b0ef774c97093e54fca7ad451b03e165c5 (diff) | |
parent | 2c748c3ef9980f5be1373fd5998349b9f63a9851 (diff) | |
download | mariadb-git-1cb17d45ce21d797f6537831acc666f6a93e91e5.tar.gz |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/rpl_sp.result')
0 files changed, 0 insertions, 0 deletions