diff options
| author | unknown <pem@mysql.comhem.se> | 2003-10-27 10:50:18 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-10-27 10:50:18 +0100 |
| commit | 87eb9ea2b10e5ae9d251444e9f3372b958f6a7ea (patch) | |
| tree | 8133f175da762cc89a5b80764c27108656c97566 | |
| parent | e61d2e6ed6326a797a09f72297fdb8b075b6e9f7 (diff) | |
| download | mariadb-git-87eb9ea2b10e5ae9d251444e9f3372b958f6a7ea.tar.gz | |
BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
Fixed. Enabled test case in client_test.c.
sql/sql_prepare.cc:
BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
Added missing parentheses in IS_PARAM_NULL to get the right bit.
tests/client_test.c:
BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
Fixed. Enabled test case.
| -rw-r--r-- | sql/sql_prepare.cc | 2 | ||||
| -rw-r--r-- | tests/client_test.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 522879c863a..da62fc0a262 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -72,7 +72,7 @@ Long data handling: #include "sql_select.h" // for JOIN #include <m_ctype.h> // for isspace() -#define IS_PARAM_NULL(pos, param_no) pos[param_no/8] & (1 << param_no & 7) +#define IS_PARAM_NULL(pos, param_no) (pos[param_no/8] & (1 << (param_no & 7))) #define STMT_QUERY_LOG_LENGTH 8192 diff --git a/tests/client_test.c b/tests/client_test.c index d6c4fb78ef9..fd9eb380228 100644 --- a/tests/client_test.c +++ b/tests/client_test.c @@ -8145,9 +8145,8 @@ int main(int argc, char **argv) test_ts(); /* test for timestamp BR#819 */ test_bug1115(); /* BUG#1115 */ test_bug1180(); /* BUG#1180 */ -#if NOT_YET_FIXED test_bug1644(); /* BUG#1644 */ -#endif + end_time= time((time_t *)0); total_time+= difftime(end_time, start_time); |