diff options
| author | unknown <bar@mysql.com> | 2007-03-01 16:06:29 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2007-03-01 16:06:29 +0400 |
| commit | 783634d6d4e70c3808e28d1837287c65672f2eec (patch) | |
| tree | 527edf446c9cddc54b4cdca85dae8c14113c018d /mysql-test/std_data | |
| parent | db30ee2642231f27c5b870066e337b2105f83cba (diff) | |
| parent | 4a83cd38eae270a20bbd257cbd3b986dbc6aab31 (diff) | |
| download | mariadb-git-783634d6d4e70c3808e28d1837287c65672f2eec.tar.gz | |
Merge mysql.com:/home/bar/mysql-5.0.merge
into mysql.com:/home/bar/mysql-5.1-rpl
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/loaddata6.dat | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/std_data/loaddata6.dat b/mysql-test/std_data/loaddata6.dat new file mode 100644 index 00000000000..29e181ebb88 --- /dev/null +++ b/mysql-test/std_data/loaddata6.dat @@ -0,0 +1 @@ +ÿ |