diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-13 09:56:56 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-13 09:56:56 +0100 |
| commit | faacf58091aa31878f0e9b6a470a5adcc83a49d2 (patch) | |
| tree | d542ef5023103a0ca1f2557b7665a8221bbf9f3b | |
| parent | 1c28548966a898ff524d74cade3f975f3bfd5511 (diff) | |
| parent | 8a34c4bb78ca1afe57819c8be276446f01087f11 (diff) | |
| download | mariadb-git-faacf58091aa31878f0e9b6a470a5adcc83a49d2.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/gone:
auto-union
mysys/my_getopt.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/table.cc:
Auto merged
| -rw-r--r-- | BitKeeper/etc/gone | 6 | ||||
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index 7c9741f7e79..dc7d1c2d315 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -456,6 +456,12 @@ arjen@fred.bitbike.com|scripts/mysql_fix_extensions.sh|20020516001337|12363|f104 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 fs +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 jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 687e96ba9cb..a77f68e886e 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2202,7 +2202,7 @@ static void reset_stmt_params(Prepared_statement *stmt) void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length) { - uchar* packet= (uchar*)packet_arg; // gcc 4.0 stgrict-aliasing + uchar *packet= (uchar*)packet_arg; // GCC 4.0.1 workaround ulong stmt_id= uint4korr(packet); ulong flags= (ulong) ((uchar) packet[4]); /* Query text for binary, general or slow log, if any of them is open */ |