Commit 1be92b48 authored by unknown's avatar unknown

Merge mysql.com:/data0/mysqldev/my/mysql-5.1

into  mysql.com:/data0/mysqldev/my/mysql-5.1-funcs1-dep


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
parents 8bbaf6ad d9fda1cf
...@@ -312,6 +312,7 @@ MCP mysql-test/t/*.def $BASE/mysql-test/t ...@@ -312,6 +312,7 @@ MCP mysql-test/t/*.def $BASE/mysql-test/t
MCP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \ MCP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \ mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \
mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \ mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
mysql-test/std_data/Index.xml \
mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \ mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \ mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \
$BASE/mysql-test/std_data $BASE/mysql-test/std_data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment