diff options
| author | unknown <sergefp@mysql.com> | 2005-09-09 10:08:46 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-09-09 10:08:46 +0400 |
| commit | 5ed7e97310c2c5e8f7ec50bf0e15fb01cce53407 (patch) | |
| tree | f1b1e8aeb74cd1148377fe9052f626cce27c1bae /mysql-test/r/variables.result | |
| parent | 65ba93fda94e153ee66ed01824ae40296250e5ff (diff) | |
| parent | eb769e54b8ab429cb86502866d438a44fcee7473 (diff) | |
| download | mariadb-git-5ed7e97310c2c5e8f7ec50bf0e15fb01cce53407.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12943
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/variables.result')
0 files changed, 0 insertions, 0 deletions