into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
libmysql/libmysql.c:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_cache.test:
Auto merged
mysql-test/t/ndb_charset.test:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/t/ndb_types.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_select.cc:
Auto merged
* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with
'index' scan.
mysql-test/r/range.result:
Update the test result after the changed cost
sql/opt_range.cc:
Fix for BUG#10037
* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with
'index' scan.
* make QUICK_GROUP_MIN_MAX_SELECT handle the case where the source table is empty.
by simply disallowing alter procedure/function in an SP (as for drop).
mysql-test/r/sp-error.result:
Added test case for BUG#7047.
mysql-test/t/sp-error.test:
Added test case for BUG#7047.
sql/share/errmsg.txt:
Modified error message for "update procedure/function" too.
sql/sql_yacc.yy:
Don't allow alter procedure/function in an SP.
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.
Bug in the optimizer caused an infinite loop for weird code.
mysql-test/r/sp.result:
New test case for BUG#6898.
mysql-test/t/sp.test:
New test case for BUG#6898.
sql/sp_head.cc:
Detect self referencing jumps in the optimizer.
Fixed bug #9681.
The bug happened with queries using derived tables specified by
a SELECT with ROLLUP, such as:
SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
if column a of table t1 is declared as NOT NULL.
This was to the fact that the first column of the temporary table
created to contain the derived table erroneously inherited the NOT NULL
attribute from column a.
olap.result, olap.test:
Added a test case for bug #9681.
mysql-test/t/olap.test:
Added a test case for bug #9681.
mysql-test/r/olap.result:
Added a test case for bug #9681.
sql/sql_select.cc:
Fixed bug #9681.
The bug happened with queries using derived tables specified by
a SELECT with ROLLUP, such as:
SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
if column a of table t1 is declared as NOT NULL.
This was to the fact that the first column of the temporary table
created to contain the derived table erroneously inherited the NOT NULL
attribute from column a.
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
