diff options
| author | unknown <kostja@bodhi.local> | 2006-07-13 00:18:59 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-13 00:18:59 +0400 |
| commit | 26f0d13d0163beba2ae4f96396302b0c44407c65 (patch) | |
| tree | 72d131bf20c7f83d51448986e035a8f9cbfb5c73 /mysql-test/r/func_math.result | |
| parent | e8699b56140571305b898c29bdc45a5bab117a45 (diff) | |
| parent | fe4ed2440dad75c005465315199243cdec36a7f4 (diff) | |
| download | mariadb-git-26f0d13d0163beba2ae4f96396302b0c44407c65.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/federated.result:
Manual merge.
mysql-test/t/federated.test:
Manual merge.
sql/sql_insert.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/func_math.result')
0 files changed, 0 insertions, 0 deletions