diff options
| author | unknown <jimw@mysql.com> | 2005-10-27 18:46:00 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-10-27 18:46:00 -0700 |
| commit | 80a8d8c4f818e80cae612a3bb020039a3846437a (patch) | |
| tree | 16be35acb7bbb6062af06b67f2f9e599b8d7670a /mysql-test/r/sp_trans.result | |
| parent | a397d1f7149dcdeac86e9e4870780dcd8e99a908 (diff) | |
| parent | 5e8515d9f2ccada3e19b109196fb5654e7c9db92 (diff) | |
| download | mariadb-git-80a8d8c4f818e80cae612a3bb020039a3846437a.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/t/func_math.test:
Auto merged
mysql-test/r/func_math.result:
Resolve conflict
sql/item_func.cc:
Resolve conflict
Diffstat (limited to 'mysql-test/r/sp_trans.result')
0 files changed, 0 insertions, 0 deletions