univ.i: Do not #define YYDEBUG, because it is only useful for debugging
the grammar of the Bison-generated InnoDB SQL parser.

row_build(): Remove type==ROW_COPY_ALSO_EXTERNALS, because it is never
passed.

Replace max-no-ndb compilation flags with --with-plugin=innobase.

setup.sh: Create symbolic links to the build scripts instead of copying them.

ChangeSet
  2006/08/23 13:59:16-07:00 brian@zim.(none) 
  This patch removes need for a innodb to have its own configure. 

univ.i: Replace ../ib_config.h with config.h.

Makefile.i, Makefile.am: Change directory paths.

configure.in: Delete.

plug.in: New file, included from the top-level configure.in.

setup.sh: Replace configure.in with plug.in.

to the data dictionary cache.

Replace some printf(...) in debug builds with fprintf(stderr, ...).

and lexer files).  From now on, the following Emacs cc-mode settings apply
when indenting C function bodies in InnoDB:

(setq c-basic-offset 8)
(setq c-label-minimum-indentation 0)
(add-to-list 'c-offsets-alist '(c . 0))
(add-to-list 'c-offsets-alist '(label . [0]))

The indentation rules for function declarations still have not been
formalized, and they must be formatted manually.

Try to limit all lines to at most 79 characters (assuming TAB stops every
8 characters) by splitting lines before opening parenthesis, or at
string constants.

Fix some grammar mistakes in diagnostic output:
 match to, match with -> match
 found from -> found in
 trying rename -> trying to rename

Fix an error in page_check_dir(): it said "supremum not pointed to"
when the infimum was not pointed to.

Enclose commented-out code snippets in #if 0 ... #endif instead of /* ... */.
Add (void*) casts to some %p parameters in fprintf() calls.  Try to
split lines before a binary operator, not after one.  (These three fixes
were not made everywhere.)

following an error in r761.

PAGE_CUR_LE searches.

page_validate(): Add missing space to error print.

Lock and unlock prepare_commit_mutex under the same conditions.

excessive space usage of the error log.

warning "no return value from a function returning non-void".

in a comparison.  Initialize it.

to reflect the deleted statements in r420, which somehow reappeared
in the MySQL tree.

ChangeSet@1.2181.173.1  2006-08-02 17:57:06+02:00  ingo@local

Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)
Changed back the encoded temp file prefix to #sql.

due to this MySQL change to row0mysql.c not being merged:

http://mysql.bkbits.net:8080/mysql-5.1/diffs/storage/innobase/row/row0mysql.c@1.126.1.1

Replace the local variable "trx" with "prebuilt->trx".

Also, replace the second invocation of the macro current_thd with
the local variable thd.

# ChangeSet
#   2006/07/30 05:16:08+04:00 aivanov@mysql.com 
#   Make innodb_thread_concurrency 0 by default.
#    Fixing test result.
# 
# mysql-test/r/innodb.result
#   2006/07/30 05:16:05+04:00 aivanov@mysql.com +1 -1
#   Make innodb_thread_concurrency 0 by default.
#    Fixing test result.

in the 5.0 tree and now merged to the 5.1 tree):

# ChangeSet
#   2006/07/29 07:17:33+04:00 aivanov@mysql.com 
#   Make innodb_flush_log_at_trx_commit a settable global variable.
# 
# sql/ha_innodb.cc
#   2006/07/29 07:17:29+04:00 aivanov@mysql.com +1 -3
#   Remove innobase_flush_log_at_trx_commit
#   (set srv_flush_log_at_trx_commit directly).
# 
# sql/ha_innodb.h
#   2006/07/29 07:17:29+04:00 aivanov@mysql.com +1 -1
#   Remove innobase_flush_log_at_trx_commit.
#   Declare srv_flush_log_at_trx_commit.
# 
# storage/innobase/include/srv0srv.h
#   2006/07/29 07:17:30+04:00 aivanov@mysql.com +1 -1
#   Change the type of srv_flush_log_at_trx_commit.
# 
# storage/innobase/srv/srv0srv.c
#   2006/07/29 07:17:30+04:00 aivanov@mysql.com +1 -1
#   Change the type of srv_flush_log_at_trx_commit.
# 

# ChangeSet
#   2006/07/28 21:27:01+04:00 sergefp@mysql.com 
#   BUG#14940 "MySQL choose wrong index", v.2
# mysql-test/r/innodb_gis.result
#   2006/07/28 21:26:56+04:00 sergefp@mysql.com +15 -15
#   BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

as suggested by Marko

Add update_thd() to several places in ha_innodb.cc to make sure prebuilt->trx points to the right trx object; in other functions add assertions that prebuilt->trx is for this thd; when 5.1 stabilizes, we can change these assertions to ut_ad() debug version assertions

message.

This has already been changed in the MySQL source code tree.

call that was accidentally removed in r674.

Do not call read_view_close_for_mysql().  (Bug #19834)

rsql_IDENTIFIER_recover_innodb_tmp_table, which is redundant and
was broken with the introduction of the "safe" file name encoding of
identifiers.  (Bug #21313)

#21112.