diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-21 13:02:57 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-21 13:02:57 +0200 |
| commit | 2f3a17b63e4e207ae8796d953ba611a593e3ee2c (patch) | |
| tree | a5373ac33cc100031b219da1e424961b585d3947 /sql | |
| parent | 1b72f3618b901f017fc4f5db5dbaad72ca79243a (diff) | |
| download | mariadb-git-2f3a17b63e4e207ae8796d953ba611a593e3ee2c.tar.gz | |
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
include/my_global.h:
Fixed unsafe define of uint4korr()
mysql-test/lib/mtr_report.pl:
Removed wrong messages when using --extern
mysql-test/mysql-test-run.pl:
Fixed that --extern works
Print help on stdout instead of stderr (make it easier to pipe it to less)
mysql-test/t/ndb_lock.test:
Added other possible error code
sql/sql_prepare.cc:
Removed not needed casts
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 050885e7d17..44595c5da8a 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2203,11 +2203,11 @@ void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length) { uchar *packet= (uchar*)packet_arg; // GCC 4.0.1 workaround ulong stmt_id= uint4korr(packet); - ulong flags= (ulong) ((uchar) packet[4]); + ulong flags= (ulong) packet[4]; /* Query text for binary, general or slow log, if any of them is open */ String expanded_query; #ifndef EMBEDDED_LIBRARY - uchar *packet_end= (uchar *) packet + packet_length - 1; + uchar *packet_end= packet + packet_length - 1; #endif Prepared_statement *stmt; bool error; |