diff options
| author | unknown <jimw@mysql.com> | 2005-08-01 17:11:49 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-01 17:11:49 -0700 |
| commit | dc6810ec5bcd25733c3601e7ed1f81d86d90b4a3 (patch) | |
| tree | 2d4365ccb9793188e721db42f84815eaa7803939 /mysql-test/t/user_var.test | |
| parent | a69ca6dc99826bbfdb8f10bde508504eceab15ae (diff) | |
| parent | 5841d70af8ea31288398229926dd647a7bacd852 (diff) | |
| download | mariadb-git-dc6810ec5bcd25733c3601e7ed1f81d86d90b4a3.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-11402
into mysql.com:/home/jimw/my/mysql-4.1-clean
sql/item_func.cc:
Auto merged
mysql-test/t/func_math.test:
Resolve conflict
Diffstat (limited to 'mysql-test/t/user_var.test')
0 files changed, 0 insertions, 0 deletions