diff options
author | unknown <monty@mysql.com> | 2003-12-21 19:39:32 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2003-12-21 19:39:32 +0200 |
commit | d31c6628e1494dd561f96cfb8a1fbfde17fc8ed4 (patch) | |
tree | 82780d2f52e09f3ef112e35fc6f6b3e1dadc3a56 /sql/log_event.cc | |
parent | 9e56a0a7711e1f6f2b234db54b3e3d2004069bbf (diff) | |
download | mariadb-git-d31c6628e1494dd561f96cfb8a1fbfde17fc8ed4.tar.gz |
Portability fixes found during 5.0 test compilation
Fixed bug in ORDER BY on a small column (Bug #2147)
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
client/mysqltest.c:
Added handling of error on query send
(Needed for init_connection.test)
mysql-test/mysql-test-run.sh:
Added tracing of mysqldump and mysqlbinlog
mysql-test/r/init_connect.result:
Updated tests
mysql-test/r/order_by.result:
Added test for bug filesort bug
mysql-test/t/init_connect-master.opt:
Added proper quoting (for Solaris and OSF)
mysql-test/t/init_connect.test:
Portability fix
mysql-test/t/order_by.test:
Added test for bug #2147 (bug in filesort)
sql/filesort.cc:
Fixed bug in filesort (Bug #2147)
sql/item.h:
Clear 'fixed' on cleanup (For prepared statements)
sql/item_func.cc:
Protect mutex destroy.
(Fixed error from pthread_mutex_destroy() when one had wrong errmsg file)
sql/log_event.cc:
Portability fix
sql/sql_class.h:
Fixed compiler warning
sql/sql_prepare.cc:
Portability fix. (Some compilers doesn't support jump over variables declared in for())
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index b609e6c6b11..1f20948aa82 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2344,13 +2344,13 @@ int User_var_log_event::exec_event(struct st_relay_log_info* rli) float8get(real_val, val); it= new Item_real(real_val); val= (char*) &real_val; // Pointer to value in native format - val_len= sizeof(real_val); + val_len= 8; break; case INT_RESULT: int_val= (longlong) uint8korr(val); it= new Item_int(int_val); val= (char*) &int_val; // Pointer to value in native format - val_len= sizeof(int_val); + val_len= 8; break; case STRING_RESULT: it= new Item_string(val, val_len, charset); |