diff options
| author | unknown <aelkin@mysql.com> | 2006-04-25 20:05:15 +0300 |
|---|---|---|
| committer | unknown <aelkin@mysql.com> | 2006-04-25 20:05:15 +0300 |
| commit | 3b6263b88cbb91c38f4fcec86a5d19de604855d4 (patch) | |
| tree | 96bcefe1c6d26a68dfcb4305fbf1b8de217283e4 /libmysql_r | |
| parent | 1e869b0e58207ad3d1bb992b4aa164234a71066e (diff) | |
| parent | d00a6cf46c63576abf3d0682af752ab53e3876fd (diff) | |
| download | mariadb-git-3b6263b88cbb91c38f4fcec86a5d19de604855d4.tar.gz | |
Merge mysql.com:/home/elkin/MySQL/BARE/5.0
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/case.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/t/case.test:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
storage/myisam/myisam_ftdump.c:
Auto merged
sql/sql_base.cc:
manual merge use local. Another changeset for 5.1 is following.
Diffstat (limited to 'libmysql_r')
0 files changed, 0 insertions, 0 deletions