diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-11 20:19:52 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-11 20:19:52 +0300 |
| commit | 9bf58f4fac22a61190b26a13b7ef6f5ec2b85ff2 (patch) | |
| tree | 0c2df4ea1281838e375d4087e0cd217f5de5140d /sql | |
| parent | 494a3a0fc74ef5ea5547e54603808b11221ec4c1 (diff) | |
| download | mariadb-git-9bf58f4fac22a61190b26a13b7ef6f5ec2b85ff2.tar.gz | |
Fixed bug in REGEXP for Linux Alpha
Docs/manual.texi:
Updated MyODBC section
libmysql/conf_to_src.c:
Fixed wrong typecast
mysql-test/r/func_regexp.result:
Added test case for REGEXP bug
mysql-test/t/func_regexp.test:
Added test case for REGEXP bug
regex/engine.c:
Fixed wrong type
regex/regexec.c:
Fixed wrong type
sql/records.cc:
Fixed test of READ lock
sql/slave.cc:
Cleanup
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/records.cc | 2 | ||||
| -rw-r--r-- | sql/slave.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/records.cc b/sql/records.cc index 56e0536e75a..3187aa424d7 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -69,7 +69,7 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table, my_default_record_cache_size && !table->file->fast_key_read() && (table->db_stat & HA_READ_ONLY || - table->reginfo.lock_type == TL_READ) && + table->reginfo.lock_type <= TL_READ_NO_INSERT) && (ulonglong) table->reclength*(table->file->records+ table->file->deleted) > (ulonglong) MIN_FILE_LENGTH_TO_USE_ROW_CACHE && diff --git a/sql/slave.cc b/sql/slave.cc index be1d919c4cd..5c713d5cf55 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1002,7 +1002,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) thd->net.vio = net->vio; // mysql_load will use thd->net to read the file thd->net.pkt_nr = net->pkt_nr; - // make sure the client does get confused + // make sure the client does not get confused // about the packet sequence if(mysql_load(thd, &ex, &tables, fields, handle_dup, 1, TL_WRITE)) |