Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle
sql/ha_innodb.cc:
Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle
Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck
sql/sql_handler.cc:
Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
ha_innodb.cc:
Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)
Free BLOB heap of handle when MySQL calls some ::extra()'s
sql/ha_innodb.cc:
Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)
innobase/include/row0mysql.h:
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/include/row0sel.h:
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/include/ut0mem.h:
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/row/row0mysql.c:
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/row/row0sel.c:
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/ut/ut0mem.c:
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
Delete: mysys/xml.c
xml.c:
Rename: BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d -> mysys/xml.c
It is actually moved to /strings
BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d:
Delete: mysys/xml.c
innobase/mem/mem0pool.c:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Allow empty key list in USE|IGNORE|FORCE INDEX()
mysql-test/r/myisam.result:
New explain format
mysql-test/t/myisam.test:
test of index()
mysys/my_handler.c:
Updated ha_key_cmp() to be as latest _mi_key_cmp() in 4.0
sql/sql_lex.cc:
Post merge fix
sql/sql_lex.h:
Post merge fix
sql/sql_parse.cc:
Post merge fix
sql/sql_yacc.yy:
Post merge fix for FORCE INDEX ()
Allow empty key list in USE|IGNORE|FORCE INDEX()
mysql-test/r/alter_table.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/create.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/innodb.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/isam.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/select.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/show_check.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_blob.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_float.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_ranges.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
sql/field.cc:
In field type charset rather than collation name is displayed
sql/sql_db.cc:
COLLATE clause has been added into SHOW CREATE DATABASE
sql/sql_lex.cc:
Detect charset names rather than collation names
sql/sql_show.cc:
COLLATION field has been added into SHOW FIELDS
sql/sql_yacc.yy:
COLLATE syntax has been added in CREATE TABLE/DATABASE
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
client/mysqladmin.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/Makefile.am:
Auto merged
include/my_base.h:
Auto merged
innobase/log/log0log.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/myisam.result:
Auto merged
sql/lex.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/test-insert.sh:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
configure.in:
merge with 4.0.9
innobase/btr/btr0pcur.c:
merge with 4.0.9
myisam/mi_check.c:
merge with 4.0.9
myisam/mi_search.c:
merge with 4.0.9
mysql-test/t/myisam.test:
merge with 4.0.9
sql/log_event.cc:
merge with 4.0.9
sql/mysql_priv.h:
merge with 4.0.9
sql/sql_lex.h:
merge with 4.0.9
sql/sql_parse.cc:
merge with 4.0.9
sql/sql_yacc.yy:
merge with 4.0.9
Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved.
include/my_base.h:
Don't count NULL values in cardinalty
myisam/mi_check.c:
Don't count NULL values in cardinalty
myisam/mi_extra.c:
Free row buffer cache after each query
myisam/mi_open.c:
Avoid realloc if cache size doesn't change
myisam/mi_search.c:
Don't count NULL values in cardinalty
myisam/myisamdef.h:
Change buffer length from uint to uint32 to make it more portable/predictable
mysql-test/r/myisam.result:
Test case for cardinality with NULL keys and FORCE INDEX
mysql-test/t/myisam.test:
Test case for cardinality with NULL keys and FORCE INDEX
sql/lex.h:
Added table join option FORCE INDEX
sql/mysql_priv.h:
Added table join option FORCE INDEX
sql/opt_range.cc:
Added table join option FORCE INDEX
sql/sql_base.cc:
Added table join option FORCE INDEX
sql/sql_lex.h:
Added table join option FORCE INDEX
sql/sql_parse.cc:
Added table join option FORCE INDEX
Don't use strlen() on hostname without first checking if it's not NULL
sql/sql_select.cc:
Added table join option FORCE INDEX
sql/sql_yacc.yy:
Added table join option FORCE INDEX
sql/table.h:
Added table join option FORCE INDEX
Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/buf/buf0buf.c:
Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/include/buf0buf.h:
Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/include/mem0pool.h:
Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/mem/mem0pool.c:
Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/srv/srv0srv.c:
Make smaller buffer headers and the lock table; fix AWE high_end bug
Fix for SHOW VARIABLES in embedded server
Docs/internals.texi:
Added documentation for join_buffer_size
configure.in:
Changed version number
sql/log_event.cc:
Fix for bug in LOAD DATA INFILE
sql/log_event.h:
Fix for bug in LOAD DATA INFILE
sql/slave.cc:
Fix for bug in LOAD DATA INFILE
sql/sql_show.cc:
Fix for SHOW VARIABLES in embedded server
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
mysql-test/r/order_by.result:
Auto merged
mysql-test/t/order_by.test:
Auto merged
sql/sql_select.cc:
Auto merged
