diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-02 12:01:24 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-02 12:01:24 +0300 |
| commit | e0a6b02c5d0a311e7167295494786077009743d1 (patch) | |
| tree | 72c934fe42261ad5de3139961e092f57e9d147df /storage/innobase/include/trx0trx.h | |
| parent | d2f8b7d04503478ab6b6998194a2070891f0c2bb (diff) | |
| parent | 6ad06b15222300e4eed4fe3972d1ad249c4c42a2 (diff) | |
| download | mariadb-git-e0a6b02c5d0a311e7167295494786077009743d1.tar.gz | |
Merge with MySQL 5.1.49
Fixed Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins' in a better way (patch from Sergey Petrunya)
Diffstat (limited to 'storage/innobase/include/trx0trx.h')
| -rw-r--r-- | storage/innobase/include/trx0trx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index cdbf1970715..97a47d9f46e 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -444,6 +444,8 @@ struct trx_struct{ char** mysql_query_str;/* pointer to the field in mysqld_thd which contains the pointer to the current SQL query string */ + size_t* mysql_query_len;/* pointer to the length of the + current SQL query string */ const char* mysql_log_file_name; /* if MySQL binlog is used, this field contains a pointer to the latest file |