diff options
| author | unknown <wax@mysql.com> | 2005-01-03 18:35:58 +0500 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2005-01-03 18:35:58 +0500 |
| commit | 5ae33d6ee82d00310f1584d9f6f6113ff246a211 (patch) | |
| tree | 154f7b7fe62846c8e7fb2159682ae1d1108615ee | |
| parent | 842cde98c761a9b23a6f93581b28c7ae76c844b7 (diff) | |
| parent | 942ae30f8f89c4ef7ec698578791adb1378c903b (diff) | |
| download | mariadb-git-5ae33d6ee82d00310f1584d9f6f6113ff246a211.tar.gz | |
Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | myisam/mi_check.c | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f8dd043ff10..d6ab5ae3180 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -164,6 +164,7 @@ paul@frost.snake.net paul@ice.local paul@ice.snake.net paul@kite-hub.kitebird.com +paul@snake-hub.snake.net paul@teton.kitebird.com pekka@mysql.com pem@mysql.com diff --git a/myisam/mi_check.c b/myisam/mi_check.c index f7e7ffd42f6..0123278a23f 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1466,12 +1466,14 @@ static int writekeys(MI_CHECK *param, register MI_INFO *info, byte *buff, if (_mi_ft_add(info,i,(char*) key,buff,filepos)) goto err; } +#ifdef HAVE_SPATIAL else if (info->s->keyinfo[i].flag & HA_SPATIAL) { uint key_length=_mi_make_key(info,i,key,buff,filepos); if (rtree_insert(info, i, key, key_length)) goto err; } +#endif /*HAVE_SPATIAL*/ else { uint key_length=_mi_make_key(info,i,key,buff,filepos); diff --git a/sql/set_var.cc b/sql/set_var.cc index e39d9934278..082c55db188 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2948,7 +2948,7 @@ bool sys_var_thd_storage_engine::check(THD *thd, set_var *var) enum db_type db_type; if (!(res=var->value->val_str(&str)) || !(var->save_result.ulong_value= - (ulong) db_type= ha_resolve_by_name(res->ptr(), res->length())) || + (ulong) (db_type= ha_resolve_by_name(res->ptr(), res->length()))) || ha_checktype(db_type) != db_type) { value= res ? res->c_ptr() : "NULL"; |