summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bug #6765 "Implicit access to time zone description unknown2004-12-0924-30/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tables requires privileges for them if some table or column level grants present" (with after-review fixes). We should set SELECT_ACL for implicitly opened tables in my_tz_check_n_skip_implicit_tables() to be able to bypass privilege checking in check_grant(). Also we should exclude those tables from privilege checking in multi-update. mysql-test/r/timezone2.result: Extended test for bug #6116 "SET time_zone := ... requires access to mysql.time_zone tables" Added test for bug #6765 "Implicit access to time zone description tables requires privileges for them if some table or column level grants present" mysql-test/t/timezone2.test: Extended test for bug #6116 "SET time_zone := ... requires access to mysql.time_zone tables" Added test for bug #6765 "Implicit access to time zone description tables requires privileges for them if some table or column level grants present" sql/item_geofunc.cc: sql_acl.h is now included via mysql_priv.h sql/item_strfunc.cc: sql_acl.h is now included via mysql_priv.h sql/log.cc: sql_acl.h is now included via mysql_priv.h sql/mysql_priv.h: Now we have to include sql_acl.h before tztime.h, since my_tz_check_n_skip_implicit_tables() defined there requires SELECT_ACL constant defined in sql_acl.h. sql/mysqld.cc: sql_acl.h is now included via mysql_priv.h sql/repl_failsafe.cc: sql_acl.h is now included via mysql_priv.h sql/set_var.cc: sql_acl.h is now included via mysql_priv.h sql/sql_acl.cc: sql_acl.h is now included via mysql_priv.h sql/sql_base.cc: sql_acl.h is now included via mysql_priv.h sql/sql_cache.cc: sql_acl.h is now included via mysql_priv.h sql/sql_class.cc: sql_acl.h is now included via mysql_priv.h sql/sql_db.cc: sql_acl.h is now included via mysql_priv.h sql/sql_derived.cc: sql_acl.h is now included via mysql_priv.h sql/sql_do.cc: sql_acl.h is now included via mysql_priv.h sql/sql_insert.cc: sql_acl.h is now included via mysql_priv.h sql/sql_parse.cc: check_one_table_access(): Tweaked comments. multi_update_precheck(): Added skipping of implicitly opened tables during privilege checking. sql/sql_prepare.cc: sql_acl.h is now included via mysql_priv.h sql/sql_repl.cc: sql_acl.h is now included via mysql_priv.h sql/sql_show.cc: sql_acl.h is now included via mysql_priv.h sql/sql_update.cc: sql_acl.h is now included via mysql_priv.h sql/sql_yacc.yy: sql_acl.h is now included via mysql_priv.h sql/tztime.h: my_tz_check_n_skip_implicit_tables(): We should set SELECT_ACL for implictly opened tables to be able to bypass privilege checking in check_grant().
* added error code message for 897unknown2004-11-261-1/+2
|
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-264-59/+81
|\ | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
| * cleaned up code a bitunknown2004-11-264-59/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added command CONNECT in management client added some verbose printouts removed prompt printout on !isatty(0) ndb/src/mgmapi/mgmapi.cpp: improved verbose printouts on connecting to management server ndb/src/mgmclient/CommandInterpreter.cpp: cleaned up code a bit added command CONNECT in management client added some verbose printouts ndb/src/mgmclient/main.cpp: removed prompt printout on !isatty(0) ndb/src/mgmclient/ndb_mgmclient.hpp: added verbose opotion
* | ha_innodb.cc:unknown2004-11-261-0/+3
| | | | | | | | | | | | | | | | Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error sql/ha_innodb.cc: Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error
* | Many files:unknown2004-11-2611-16/+90
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/buf/buf0buf.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/buf/buf0lru.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/include/buf0lru.h: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/include/db0err.h: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/include/row0sel.h: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/include/ut0mem.h: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/mem/mem0pool.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/row/row0mysql.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/row/row0sel.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/srv/srv0start.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/ut/ut0mem.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-252-4/+8
|\ | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
| * moved default setting to config.ini to MgmtSrvrunknown2004-11-252-4/+8
| | | | | | | | | | | | | | | | only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given ndb/src/mgmsrv/main.cpp: moved default setting to config.ini to MgmtSrvr
* | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-257-8/+66
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/space/bkroot/mysql-4.1
| * \ Mergeunknown2004-11-257-8/+66
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_repl.cc: Auto merged sql/repl_failsafe.cc: Merging 4.0 and 4.1 changes.
| | * \ Merge mysql.com:/space/bkroot/mysql-4.0unknown2004-11-257-7/+66
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/bk/b6148-mysql-4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | | * | Fix for Bug#6148. Only rewind read position in binary log when theunknown2004-11-256-7/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slave SQL thread is started. sql/slave.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/slave.h: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/sql_repl.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/repl_failsafe.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread.
* | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-253-10/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-253-10/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441 sql/item_func.cc: Auto merged sql/item_sum.h: Auto merged
| | * | | | A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when ↵unknown2004-11-063-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returning multiple rows). sql/item_func.cc: A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows). Do nothing in the udf_handler destructor if not_original flag is set. sql/item_sum.h: A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows). Set udf.not_original flag if we create an Item from the existent one. sql/sql_udf.h: A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows). not_original flag added.
* | | | | | table.cc:unknown2004-11-251-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1 sql/table.cc: Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-254-67/+50
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-253-51/+33
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
| | * | | | ndb/src/common/logger/LogHandler.cppunknown2004-11-253-51/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed so that error is returned if format is wrong in logger param parsing ndb/src/common/logger/Logger.cpp some debuf printout added ndb/src/mgmsrv/InitConfigFileParser.cpp rewrote parsing on parseNameValuePair, was buggy ndb/src/common/logger/LogHandler.cpp: changed so that error is returned if format is wrong in logger param parsing ndb/src/common/logger/Logger.cpp: some debuf printout added ndb/src/mgmsrv/InitConfigFileParser.cpp: rewrote parsing on parseNameValuePair, was buggy
| * | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-251-16/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * \ \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-11-251-16/+17
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| | | * | | | | bug#6775 - ndb - fix bug introduced by bug fix unknown2004-11-251-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Scan number allocation must be on table even in case of range scan Otherwise scan takeover won't work as LQHKEYREQ contains table
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-244-12/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | | | bug#6784unknown2004-11-243-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mi_flush_bulk_insert (on dup key error in mi_write) was mangling info->dupp_key_pos
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-241-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | | | | harmless "buffer overflow" fixedunknown2004-11-241-2/+2
| | | | | | | | |
* | | | | | | | | configure.in:unknown2004-11-241-0/+3
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system innobase/configure.in: Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
* | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-241-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
| * | | | | | | | added explanation of error code 4335unknown2004-11-241-1/+2
| |/ / / / / / /
* | | | | | | | Bug#6787 LIKE not working properly with _ and utf8 dataunknown2004-11-246-13/+34
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-243-22/+31
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-11-243-22/+31
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1 ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/ndbapi/NdbConnection.cpp: Auto merged
| | * | | | | bug#6775 - ndbunknown2004-11-243-22/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Queue scan on real fragment. Index fragment for range scans Table fragment for table scans ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Document meaning of fragPtrI and how it differs from scanTcRec->fragmentptr ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Queue scan on real fragment. Index fragment for range scans Table fragment for table scans ndb/src/ndbapi/NdbConnection.cpp: Check tOp before assigning
* | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-241-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
| * | | | | | | also backup needs triggersunknown2004-11-241-3/+5
| | | | | | | |
| * | | | | | | calculation of noOfTriggersunknown2004-11-241-0/+13
| | | | | | | |
* | | | | | | | Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1unknown2004-11-241-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | client/mysqladmin.cc: Auto merged
| * | | | | | Ensure consistent sources up to 5.0 where a C++ problem occurs.unknown2004-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqladmin.c: Cast to overcome a C vs. C++ signature problem, occurring in 5.0 where this is a C++ file.
* | | | | | | added mgmapi/mgmapi_config_parameters.h, mgmapi/mgmapi_config_parameters_debug.hunknown2004-11-241-4/+4
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to distribution
* | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-242-4/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * \ \ \ \ \ Merged 4.0 change into 4.1unknown2004-11-241-2/+10
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Merged new default "--force" (can be switched off using "--one-error") from 4.0 into 4.1
| | * | | | | Change "Do-compile" to make automatic build log analysis easier and unknown2004-11-231-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to run the standard tests with "--force" (default, can be switched off). Build-tools/Do-compile: 1) For an automated log analysis, we need a clear marker in the build log whether compile + link succeeded: Write it after successful "make". 2) Ensure the standard tests are run with "--force" in the default case, but allow the old behaviour by an option "--one-error". 3) Correct a typing error in the usage message.
| * | | | | | uca-dump.c:unknown2004-11-241-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use less wide spaces on the primary level, to avoid big diff for ctype-uca.c. strings/uca-dump.c: Use less wide spaces on the primary level, to avoid big diff for ctype-uca.c.
* | | | | | merge errorunknown2004-11-241-1/+0
| | | | | |
* | | | | | Merge mysql.com:/home/jonas/src/wl2077unknown2004-11-2428-1761/+557
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/ndbapi/NdbConnection.cpp: Auto merged
| * | | | | | ndb - debug printoutunknown2004-11-241-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: print state on rare crash
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-231-4/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | | use FT_MAX_WORD_LEN_FOR_SORT instead of HA_FT_MAXBYTELEN when calculatingunknown2004-11-231-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preferred key block length for ft index
| * | | | | | Delete: mysql-test/mysql_test_run.cunknown2004-11-231-1728/+0
| | | | | | |
| * | | | | | Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2004-11-231-4/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/wax/mysql/mysql-4.1bug sql/mysqld.cc: Auto merged
View Lorry Controller Status