diff options
| author | unknown <jimw@mysql.com> | 2006-04-30 09:43:26 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-30 09:43:26 -0700 |
| commit | 9f7548ae36faeed152160751ef9e8cc93abea5de (patch) | |
| tree | bf3b1f1d96ac8393acffa8ef611566267ddaab3d /mysql-test/ndb/restart_log.result | |
| parent | 472f4a84d258624df901aa3096a733cf73c45c3b (diff) | |
| parent | 96f58e1b268fdcf0c495efacd05268f1ad6f23ad (diff) | |
| download | mariadb-git-9f7548ae36faeed152160751ef9e8cc93abea5de.tar.gz | |
Merge mysql.com:/home/jimw/my/tmp_merge
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/user_var.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/ndb/ndbcluster.sh:
Resolve conflict
sql/set_var.cc:
Resolve conflict
sql/share/errmsg.txt:
Resolve conflict
Diffstat (limited to 'mysql-test/ndb/restart_log.result')
0 files changed, 0 insertions, 0 deletions