Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT rows (100)
myisam/mi_check.c:
Fixed bug in copying statistics for disabled index
mysql-test/r/distinct.result:
Fix result after not doing key statistics for first insert.
mysql-test/r/fulltext.result:
Fix result after not doing key statistics for first insert.
mysql-test/r/insert.result:
Fix result after not doing key statistics for first insert.
mysql-test/r/key_diff.result:
Fix result after not doing key statistics for first insert.
mysql-test/r/order_by.result:
Fix result after not doing key statistics for first insert.
mysql-test/r/select.result:
Fix result after not doing key statistics for first insert.
mysql-test/r/show_check.result:
Fix result after not doing key statistics for first insert.
sql/ha_myisam.cc:
Don't disable index when inserting only a few rows
sql/log.cc:
Transactions in AUTOCOMMIT=0 mode didn't rotate binary log.
sql/sql_insert.cc:
Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT
This fixes a problem in replication where RESET SLAVE could crash a running slave.
mysql-test/r/rpl_failsafe.result:
Added missing drop
mysql-test/r/rpl_log_pos.result:
Added slave stop before change master
mysql-test/t/rpl_log_pos.test:
Added slave stop before change master
sql/sql_parse.cc:
reset_slave() sends it's own errors
sql/sql_repl.cc:
reset_slave() sends it own error.
RESET SLAVE and CHANGE MASTER will now give an error if slave is running.
This fixes a problem in replication where RESET SLAVE could crash a running slave.
Fixed wrong variable name for Windows
VC++Files/innobase/innobase.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/myisammrg/myisammrg.dsp:
Add missing files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Fixed included paths
VC++Files/mysqldemb/mysqldemb.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/mysqlserver/mysqlserver.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/sql/mysqld.dsp:
Fixed paths
innobase/include/univ.i:
Removed compiler warning
myisammrg/myrg_open.c:
Removed compiler warning
sql/ha_myisam.cc:
Removed compiler warning
Fixed wrong (but not dangerous) if statement
sql/ha_myisammrg.cc:
Removed compiler warning
sql/mysqld.cc:
Fixed wrong variable name for Windows
sql/sql_update.cc:
Removed not used label
We must not commit inside InnoDB when LOAD DATA INFILE just writes a block to the binlog; only commit if the log event type is QUERY_EVENT or EXECUTE_LOAD_EVENT
sql/log.cc:
We must not commit inside InnoDB when LOAD DATA INFILE just writes a block to the binlog; only commit if the log event type is QUERY_EVENT or EXECUTE_LOAD_EVENT
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
Docs/internals.texi:
Update binary protocol description
innobase/include/db0err.h:
Merge from 3.23
mysql-test/r/insert.result:
Updated test result from 3.23
sql/log.cc:
Fixed bug in replication and log rotation
sql/log_event.cc:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
Fixed bug in replication and log rotation
sql/slave.h:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
To be able to read MySQL 4.1 dump files.
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
innobase/include/db0err.h:
Skiped merge (Heikki wants to do this)
innobase/row/row0mysql.c:
Skiped merge (Heikki wants to do this)
sql/sql_show.cc:
Use local code
sql/sql_show.cc:
Fixed rare bug in show processlist which could cause core dump if a new thread was connecting.
(We where calling mutex_unlock() without having ever called mutex_lock)
sql/sql_udf.cc:
Fixed warning from valgrind
to crash-me
sql-bench/crash-me.sh:
new tests:
- INSERT with DEFAULT:
- INSERT with empty value list:
- Insert DEFAULT VALUES;
-------
-checking of reserved keywords (by courtesy of Ranger)
--------
- added "--suffix" option
- added description of "--config-file" to help section
- fixed test for DIFFERENCE()
- fixed small bug in safe_query_result (was s/,/,/ should s/,/./)
(by courtesy of Ranger)
sql-bench/server-cfg.sh:
remove "KERNEL" and add "SAPDB" to sapdb version
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
sql/mysqld.cc:
With the introduction of Pro release version the InnoDB table engine
was added for all binaries and not more define only the max package
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
sql/ha_innobase.cc:
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/include/db0err.h:
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/dict/dict0dict.c:
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/row/row0mysql.c:
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors.
libmysqld/lib_sql.cc:
Copy arguments given to mysql_server_init()
mysql-test/r/temp_table.result:
Update test results (after merge form 3.23)
sql/handler.cc:
Made keybuff_size longlong
sql/mysql_priv.h:
Made keybuff_size longlong
sql/mysqld.cc:
Made keybuff_size longlong
sql/set_var.cc:
Made keybuff_size longlong
sql/set_var.h:
Made keybuff_size longlong
sql/sql_select.cc:
Simple cleanup
sql/sql_select.h:
Make TMP_TABLE_PARAM to be allocated through Sql_alloc
sql/sql_update.cc:
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update
