diff options
| author | unknown <monty@mysql.com> | 2004-05-24 14:42:34 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-24 14:42:34 +0300 |
| commit | 406a5fa7cd48d9bb51e513bd5040a7c3499553cc (patch) | |
| tree | 14b4172c5a85ae390a88a1f2da65454dd65a0218 /sql | |
| parent | 1d9fbbe3ce58dd6ca3793d15f793e2d9cc407133 (diff) | |
| download | mariadb-git-406a5fa7cd48d9bb51e513bd5040a7c3499553cc.tar.gz | |
After merge fixes
Remove compiler warnings
Update windows project files
VC++Files/innobase/innobase.dsp:
Update project files after merge
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Update project files after merge
VC++Files/libmysqld/libmysqld.dsp:
Update project files after merge
VC++Files/myisamchk/myisamchk.dsp:
Update project files after merge
VC++Files/myisamlog/myisamlog.dsp:
Update project files after merge
VC++Files/myisampack/myisampack.dsp:
Update project files after merge
VC++Files/mysqldemb/mysqldemb.dsp:
Update project files after merge
VC++Files/sql/mysqld.dsp:
Update project files after merge
VC++Files/strings/strings.dsp:
Update project files after merge
innobase/include/data0data.ic:
Fix compiler warning
innobase/include/mem0pool.h:
Remove reference to not existing variable (after merge fix)
innobase/srv/srv0srv.c:
Remove reference to not existing variable (after merge fix)
libmysqld/libmysqld.def:
Add function used by test programs
mysql-test/r/func_str.result:
After merge fixes
mysql-test/r/variables.result:
After merge fixes
mysql-test/t/variables.test:
After merge fixes
sql/discover.cc:
Remove not used lable
sql/opt_range.cc:
Removed compiler warnings
strings/ctype-tis620.c:
After merge fixes
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/discover.cc | 1 | ||||
| -rw-r--r-- | sql/opt_range.cc | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/discover.cc b/sql/discover.cc index e260f44a8db..696be193148 100644 --- a/sql/discover.cc +++ b/sql/discover.cc @@ -159,7 +159,6 @@ int create_table_from_handler(const char *db, error = writefrm(path, frmblob, frmlen); } - err: if (frmblob) my_free((char*) frmblob,MYF(0)); DBUG_RETURN(error); diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 3cc64c35223..ddedf4ca3f0 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2313,7 +2313,7 @@ check_quick_keys(PARAM *param,uint idx,SEL_ARG *key_tree, min_range.length= min_key_length; min_range.flag= (tmp_min_flag & NEAR_MIN ? HA_READ_AFTER_KEY : HA_READ_KEY_EXACT); - max_range.key= param->max_key; + max_range.key= (byte*) param->max_key; max_range.length= max_key_length; max_range.flag= (tmp_max_flag & NEAR_MAX ? HA_READ_BEFORE_KEY : HA_READ_AFTER_KEY); @@ -2826,7 +2826,8 @@ int QUICK_SELECT_DESC::cmp_prev(QUICK_RANGE *range_arg) if (range_arg->flag & NO_MIN_RANGE) return 0; /* key can't be to small */ - cmp= key_cmp(key_part_info, range_arg->min_key, range_arg->min_length); + cmp= key_cmp(key_part_info, (byte*) range_arg->min_key, + range_arg->min_length); if (cmp > 0 || cmp == 0 && !(range_arg->flag & NEAR_MIN)) return 0; return 1; // outside of range |