sql-bench/crash-me.sh:
add tagline for emacs
add log lines to result file
remove wrong prompt for WEEK()
sql-bench/server-cfg.sh:
cleanup field conversation
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
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
libmysql/password.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_static.c:
Auto merged
mysys/my_static.h:
Auto merged
mysys/my_tempnam.c:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
mysql-test/t/temp_table.test:
Added comment
sql/mysqld.cc:
Don't apply change from 3.23
sql/sql_show.cc:
Don't apply change from 3.23
sql/structs.h:
Don't apply change from 3.23
Fixed 'not initialized' memory error.
mysql-test/mysql-test-run.sh:
Updates to be able to more easily use --valgrind
mysql-test/r/alter_table.result:
Added missing drop table
mysql-test/t/alter_table.test:
Added missing drop table
sql/field.cc:
Simple optimizations
sql/ha_innodb.cc:
Remove copying of parameters as this leads to memory leaks in MySQL.
Should be instead fixed by, in embedded server, make a temporary copy of
all parameters and free them on server-end
sql/log.cc:
Simple optimization
sql/mysql_priv.h:
Move external reference to struct to include file
sql/mysqld.cc:
Added safety asserts
sql/sql_class.cc:
Fixed non fatal 'not initialized memory reference error' in thread init
sql/sql_udf.cc:
Clear current_thd for global thread
strings/strto.c:
Simple optimization
(Fixed problem with autoconf 2.53 on Solaris)
BUILD/compile-solaris-sparc-purify:
Merge with 3.23
BUILD/compile-solaris-sparc:
Merge with 3.23
acinclude.m4:
Merge with 3.23
- sql_analyse.cc: Fixed bug in decimal handling
configure.in:
- Portability fix for HP compiler on HPUX11
libmysql/password.c:
- Portability fix for HP compiler on HPUX11
mysys/hash.c:
- Portability fix for HP compiler on HPUX11
mysys/my_static.c:
- Portability fix for HP compiler on HPUX11
mysys/my_static.h:
- Portability fix for HP compiler on HPUX11
mysys/my_tempnam.c:
- Portability fix for HP compiler on HPUX11
sql/sql_analyse.cc:
- Fixed bug in decimal handling
