diff options
| -rw-r--r-- | BitKeeper/etc/gone | 6 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 1 | ||||
| -rw-r--r-- | sql/sql_prepare.cc | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index 2d5522899d2..150abd46f9a 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -455,6 +455,12 @@ arjen@co3064164-a.bitbike.com|Docs/section.Comparisons.texi|20011108043647|22614 arjen@fred.bitbike.com|scripts/mysql_fix_extensions.sh|20020516001337|12363|f1048a78f4759b4d ccarkner@nslinuxw10.bedford.progress.com|mysql-test/r/isolation.result|20010327145543|25059|4da11e109a3d93a9 ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456 +jani@a88-113-38-195.elisa-laajakaista.fi|BUILD/SETUP.sh.rej|20070122013357|30052|b0650da46e7c4e54 +jani@a88-113-38-195.elisa-laajakaista.fi|configure.in.rej|20070122013357|43533|4b7ec608b9c90e83 +jani@a88-113-38-195.elisa-laajakaista.fi|include/my_global.h.rej|20070122013357|29911|dc7f1642f6061af +jani@a88-113-38-195.elisa-laajakaista.fi|include/my_pthread.h.rej|20070122013357|18348|a6b632d992e5df16 +jani@a88-113-38-195.elisa-laajakaista.fi|mysys/thr_alarm.c.rej|20070122013357|21935|c169568388079966 +jani@a88-113-38-195.elisa-laajakaista.fi|sql/mysqld.cc.rej|20070122013357|09337|84aad00c2111bc3 jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554 miguel@hegel.local|zlib/ChangeLog|20020319032513|28917|5d5425fc84737083 diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 3f87186ccc3..075956c7af9 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -70,6 +70,7 @@ static void default_reporter(enum loglevel level, fprintf(stderr, "%s", "Info: "); vfprintf(stderr, format, args); va_end(args); + fflush(stderr); } /* diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 75c6dacc4a7..feab4d08c32 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1781,8 +1781,9 @@ static void reset_stmt_params(Prepared_statement *stmt) packet_length Query string length, including terminator character. */ -void mysql_stmt_execute(THD *thd, char *packet, uint packet_length) +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); /* Query text for binary log, or empty string if the query is not put into |