diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-13 19:36:10 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-13 19:36:10 +0500 |
| commit | fde9c7d5b8ce11a126e586b7cd216a0d1962d3b6 (patch) | |
| tree | ae381d395c7ae8ceab1ab3c80e277730c30de334 /include | |
| parent | f1ae9c3923796e598442ace988d5f29ee08f14a4 (diff) | |
| parent | 2a0498c0f9a67676aedef2699fe5a14150ce5f4d (diff) | |
| download | mariadb-git-fde9c7d5b8ce11a126e586b7cd216a0d1962d3b6.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/create_not_windows.result:
Auto merged
mysql-test/r/join_nested.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/type_time.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/create_not_windows.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/create.result:
Merge with 5.0-opt.
mysql-test/r/type_enum.result:
Merge with 5.0-opt.
mysql-test/t/type_enum.test:
Merge with 5.0-opt.
sql/field_conv.cc:
Merge with 5.0-opt.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions