diff options
author | unknown <monty@mishka.local> | 2005-07-19 19:25:05 +0300 |
---|---|---|
committer | unknown <monty@mishka.local> | 2005-07-19 19:25:05 +0300 |
commit | 3a31f7b91f9aea5c6bab45157c3a661252720174 (patch) | |
tree | 98d1121d654b01cf2306965326d1355704fc1218 /mysql-test/r | |
parent | ddc3586495aa82f310b0e5c2127b77f28c711c27 (diff) | |
download | mariadb-git-3a31f7b91f9aea5c6bab45157c3a661252720174.tar.gz |
Simple fixes during review of new code
include/my_global.h:
Added floatget() to read unaligned flaot
mysql-test/r/select.result:
Added test for found_rows()
mysql-test/t/select.test:
Added test for found_rows()
sql/des_key_file.cc:
Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition
sql/field_conv.cc:
Added optimizzed varsion of do_cut_string (for simple character sets)
sql/item_func.cc:
Simplify code (and ensure DBUG_ENTER is excuted before main code)
sql/item_strfunc.cc:
Safe calculation of max_length
This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH)
Remove init_des_key_file() as this is not initialized in mysqld.cc
sql/item_timefunc.cc:
Safe calculation of max_length
This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH)
sql/log_event.cc:
Simplify code
sql/mysql_priv.h:
Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition
sql/mysqld.cc:
Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition
Revert wrong patch of calling close_connection() in first close_connections() loop. (Bug #7403)
Instead we now print a warning for closed connections only if mysqld is sarted with --warnings
Added comments to make the close_connections() logic clearer
sql/sql_prepare.cc:
Use floatget() and doubleget() to protect against unaligned data
sql/sql_select.cc:
Fixed some cases unlikely cases where found_rows() would return wrong for queries that would return 0 or 1 rows
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/select.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 2df60944999..993fe7d22f1 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -2594,7 +2594,26 @@ INSERT INTO t1 SELECT 50, 3, 3 FROM DUAL WHERE NOT EXISTS (SELECT * FROM t1 WHERE a = 50 AND b = 3); +select found_rows(); +found_rows() +0 SELECT * FROM t1; a b c 50 3 3 +select count(*) from t1; +count(*) +1 +select found_rows(); +found_rows() +1 +select count(*) from t1 limit 2,3; +count(*) +select found_rows(); +found_rows() +0 +select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3; +count(*) +select found_rows(); +found_rows() +1 DROP TABLE t1; |