mysql-test/r/type_timestamp.result:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
sql/table.h:
Auto merged
ndb/test/ndbapi/Makefile.am:
Using local 5.0 version.
sql/mysql_priv.h:
Merged.
sql/sql_insert.cc:
Merge needs fixes.
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.
mysql-test/r/type_timestamp.result:
Bug#7806 - insert on duplicate key and auto-update of timestamp
The test result.
mysql-test/t/type_timestamp.test:
Bug#7806 - insert on duplicate key and auto-update of timestamp
The test case.
sql/mysql_priv.h:
Bug#7806 - insert on duplicate key and auto-update of timestamp
Made check_insert_fields() static. It is used only in sql_insert.cc.
sql/sql_insert.cc:
Bug#7806 - insert on duplicate key and auto-update of timestamp
Modified the check of the insert fields so that an explicit
assignment of the timestamp field does only disable the automatic
for inserts and retains the automatic for updates.
Added a check if the update fields contain the timestamp field.
In this case, the automatic on update is disabled, but not the
automatic on insert. This is called from mysql_prepare_insert().
sql/table.h:
Bug#7806 - insert on duplicate key and auto-update of timestamp
Extended a comment to warn about usage of enum timestamp_auto_set_type.
- Segfault because of passing a 64-bit pointer to 32 bit integer.
- Add new include config_readline.h which will calculate some new defines
based on what is found in config.h
- This file was originally included in readline 4.3 as config.h.in, only the part that
makes new defines have been moved to this file.
cmd-line-utils/readline/bind.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/callback.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/complete.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/display.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/funmap.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histexpand.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histfile.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/history.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histsearch.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/input.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/isearch.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/keymaps.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/kill.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/macro.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/mbutil.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/misc.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/nls.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/parens.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/readline.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/rltty.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/search.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/shell.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/signals.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/terminal.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/text.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/tilde.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/undo.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/util.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/vi_mode.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/xmalloc.c:
Include local config_readline.h instead of config.h
Backported from 5.0.3.
innobase/row/row0ins.c:
If the SQL-query will update or replace duplicate records we take X-lock
for duplicate records.
sql/ha_innodb.cc:
INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should
take X-lock in this case for duplicate records.
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.
mysql-test/r/update.result:
Testcase for BUG#9103
mysql-test/t/update.test:
Testcase for BUG#9103
sql/opt_range.cc:
cp_buffer_from_ref now has THD* parameter
sql/sql_select.h:
cp_buffer_from_ref now has THD* parameter
scripts/make_binary_distribution.sh:
add libexec expansion handling to make_binary_distribution
support-files/mysql.server.sh:
mysql.server init.d script fixed back to use mysqld_safe by default, as mysqlmanager does not handle all
installation scenarious yet. + libexecdir template was added for mysqlmanager to deal nicely with the
source distribution
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)
mysql-test/r/show_check.result:
Testcase for BUG#9439
mysql-test/t/show_check.test:
Testcase for BUG#9439
sql/sql_show.cc:
Fix for BUG#9439:
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
myisam/mi_search.c:
Auto merged
myisam/mi_write.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/myisam.result:
SCCS merged
mysql-test/t/myisam.test:
SCCS merged
