diff options
| author | unknown <monty@nosik.monty.fi> | 2007-08-02 07:55:33 +0300 |
|---|---|---|
| committer | unknown <monty@nosik.monty.fi> | 2007-08-02 07:55:33 +0300 |
| commit | 926664fe2c802bd7ffc6d9a6b56372ba2e142b23 (patch) | |
| tree | 5c544cc45c47bbd06c8b4d216aab02fe9307f8de /mysys/mf_path.c | |
| parent | ccada6ff956e2fed0347051890445049ec9ed8df (diff) | |
| parent | f9ea427508fa5451bd22c0d6366a855a4d88800d (diff) | |
| download | mariadb-git-926664fe2c802bd7ffc6d9a6b56372ba2e142b23.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
client/client_priv.h:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlslap.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/event_data_objects.cc:
Auto merged
sql/event_queue.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_cache.cc:
Manual merge
Removed comment about bug in old code (not relevant)
Diffstat (limited to 'mysys/mf_path.c')
| -rw-r--r-- | mysys/mf_path.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_path.c b/mysys/mf_path.c index 7baded9d715..73e73cb7f76 100644 --- a/mysys/mf_path.c +++ b/mysys/mf_path.c @@ -46,7 +46,7 @@ char * my_path(char * to, const char *progname, if (!test_if_hard_path(to)) { if (!my_getwd(curr_dir,FN_REFLEN,MYF(0))) - bchange(to,0,curr_dir, (uint) strlen(curr_dir), (uint) strlen(to)+1); + bchange((uchar*) to, 0, (uchar*) curr_dir, strlen(curr_dir), strlen(to)+1); } } else |