Adjusted for storage path
nwbootstrap:
Corrected bad merge
netware/BUILD/nwbootstrap:
Corrected bad merge
netware/myisam_ftdump.def:
Adjusted for storage path
netware/myisamchk.def:
Adjusted for storage path
netware/myisamlog.def:
Adjusted for storage path
netware/myisampack.def:
Adjusted for storage path
Before this fix, a call to a User Defined Function (UDF) could,
under some circumstances, be interpreted as a call to a Stored function
instead. This occurred if a native function was invoked in the parameters
for the UDF, as in "select my_udf(abs(x))".
The root cause of this defect is the introduction, by the fix for Bug 21809,
of st_select_lex::udf_list, and it's usage in the parser in sql_yacc.yy
in the rule function_call_generic (in 5.1).
While the fix itself for Bug 21809 is correct in 5.0, the code change
merged into the 5.1 release created the issue, because the calls in 5.1 to :
- lex->current_select->udf_list.push_front(udf)
- lex->current_select->udf_list.pop()
are not balanced in case of native functions, causing the udf_list,
which is really a stack, to be out of sync with the internal stack
maintained by the bison parser.
Instead of moving the call to udf_list.pop(), which would have fixed the
symptom, this patch goes further and removes the need for udf_list.
This is motivated by two reasons:
a) Maintaining a stack in the MySQL code in sync with the stack maintained
internally in sql_yacc.cc (not .yy) is extremely dependent of the
implementation of yacc/bison, and extremely difficult to maintain.
It's also totally dependent of the structure of the grammar, and has a risk
to break with regression defects each time the grammar itself is changed.
b) The previous code did report construct like "foo(expr AS name)" as
syntax errors (ER_PARSER_ERROR), which is incorrect, and misleading.
The syntax is perfectly valid, as this expression is valid when "foo" is
a UDF. Whether this syntax is legal or not depends of the semantic of "foo".
With this change:
a) There is only one stack (in bison), and no List<udf_func> to maintain.
b) "foo(expr AS name)", when used incorrectly, is reported as semantic error:
- ER_WRONG_PARAMETERS_TO_NATIVE_FCT (for native functions)
- ER_WRONG_PARAMETERS_TO_STORED_FCT (for stored functions)
This is achieved by the changes implemented in item_create.cc
mysql-test/r/parser.result:
New tests
mysql-test/r/udf.result:
New tests
mysql-test/t/parser.test:
New tests
mysql-test/t/udf.test:
New tests
sql/item_create.cc:
Semantic checks for named parameters, as in "foo(expr AS name)".
sql/share/errmsg.txt:
New error message
sql/sql_lex.cc:
Remove usage of udf_list.
sql/sql_lex.h:
Remove usage of udf_list.
sql/sql_yacc.yy:
Remove usage of udf_list.
into mysql.com:/home/kent/bk/mysql-5.1-build
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
Allocate 128K stack for all executables (bug#23504)
netware/comp_err.def:
Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql_upgrade.def:
BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_upgrade.def
netware/Makefile.am:
Added "mysql_upgrade.def"
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
configure.in:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/include/util/OutputStream.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
sql/sql_parse.cc:
Auto merged
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/rpl_sp.result:
- Merged
- Merged; updated test case.
mysql-test/r/rpl_sp.result:
- Merged; updated test case for 5.1
mysql-test/t/rpl_sp.test:
- Merged; updated result set for 5.1
into kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/rpl_sp.result:
null merge
mysql-test/t/rpl_sp.test:
null merge
Handle events "differently" so that dict doesnt get lock too often
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/vm/KeyTable2.hpp:
Handle event separatly as they dont set block_state :-(
This prevent any subsequent node restarts, but it's better than crashing an alive node
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fix for bug#24752
This prevent any subsequent node restarts, but it's better than crashing an alive node
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
- Refactoring of duplicate code
- Modified bad test cases
- Changed expected error when operating on information_schema.
mysql-test/r/information_schema.result:
- updated result file with new error code.
mysql-test/r/rpl_sp.result:
- Modified test case
mysql-test/t/information_schema.test:
- Changed error code for operations on information_schema
mysql-test/t/rpl_sp.test:
- Modified test case
sql/sql_parse.cc:
- Cleaned up code:
* replace tab with space
* simplified if/switch statements
* refactored duplicated code
into example.com:/work/bug24395-v2/my51
mysql-test/r/alter_table.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
storage/myisam/mi_open.c:
Auto merged
sql/sql_table.cc:
manual merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
fixes to testprogram to test new impl. in 5.1
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
move tsman dumps
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
add more support for connection handling using dumps
storage/ndb/test/ndbapi/testNodeRestart.cpp:
port testprogram to 5.1 to avoid "extra" safety net in LQH
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
add testcase for bug#24717
+ fix typo
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Add new error insert 9002
which is 9000, but will auto enable when started
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
Add new error insert 9002
which is 9000, but will auto enable when started
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Fix typo
ndb/test/ndbapi/testNodeRestart.cpp:
add testcase for bug#24717
ndb/test/run-test/daily-basic-tests.txt:
add testcase for bug#24717
Server crashes if a flush commmand is issued and binlog is closed.
- added check to prevent binlog access when binlog file isn't opened.
sql/sql_parse.cc:
- removed deprecated environment consistency check.
- added check to prevent binlog access on closed binlog.
mysql-test/t/flush2-master.opt:
- Added test case (master options)
mysql-test/t/flush2.test:
- Added test case
mysql-test/r/flush2.result:
- Added test case (resultfile)
5.1 version
remove 5.0 version
add general routing signal
send tckeyref routed if needed...
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Add general routing signal
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
Add general routing signal
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
send TCKEYREF routed if needed
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
add general routing
remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
add general routing
remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
add general routing
remove node started state
remove "avoid sending committed read to early" as it now should be handled correctly
storage/ndb/include/kernel/signaldata/RouteOrd.hpp:
New BitKeeper file ``storage/ndb/include/kernel/signaldata/RouteOrd.hpp''
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/common/util/NdbSqlUtil.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
merge
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
merge
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
merge
storage/ndb/src/ndbapi/ndberror.c:
merge
5.0 version
Add some extra state to try to prevent sending committedread to node too early
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
remove extra virtual-indirection
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Add retry mechanism to send TCKEYREF
(as extra safety)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Add retry mechanism to send TCKEYREF
(as extra safety)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Add extra state to prevent sending committed reads to node to early
(before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Add extra state to prevent sending committed reads to node to early
(before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Add extra state to prevent sending committed reads to node to early
(before connection establishment)
ndb/src/kernel/vm/SimulatedBlock.cpp:
remove extra virtual-indirection
ndb/src/kernel/vm/SimulatedBlock.hpp:
remove extra virtual-indirection
Fix typo that yeilded rare crash in ACC
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
fix typo, where elementptr was sent as elementheader
yeilded very rare crashes as only 1 bit is checked
and it's only checked under certatin rare circumstances
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
Auto merged
BitKeeper/deleted/.del-OSE_Receiver.cpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
