summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-261-1/+2
|\ | | | | | | | | | | | | | | into mysql.com:/home/emurphy/iggy/mysql-5.0 sql/mysqld.cc: Auto merged
| * BUG#19322 Added help defintion for --skip-external locking to mysqld --help ↵unknown2006-05-191-1/+2
| | | | | | | | | | | | | | --verbose sql/mysqld.cc: Added --skip-external-locking to the --external-locking help.
* | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-2610-42/+150
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/kgeorge/mysql/5.0/clean
| * \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleanunknown2006-05-2610-40/+136
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kgeorge/mysql/5.0/B18681 sql/sql_acl.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/view_grant.result: resolved conflict mysql-test/t/view_grant.test: resolved merge conflict
| | * \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleanunknown2006-05-2610-40/+136
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kgeorge/mysql/5.0/B18681 sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged
| | | * | BUG#18681: View privileges are brokenunknown2006-05-2610-40/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for view security was lacking several points : 1. Check with the right set of permissions : for each table ref that participates in a view there were the right credentials to use in it's security_ctx member, but these weren't used for checking the credentials. This makes hard enforcing the SQL SECURITY DEFINER|INVOKER property consistently. 2. Because of the above the security checking for views was just ruled out in explicit ways in several places. 3. The security was checked only for the columns of the tables that are brought into the query from a view. So if there is no column reference outside of the view definition it was not detecting the lack of access to the tables in the view in SQL SECURITY INVOKER mode. The fix below tries to fix the above 3 points. mysql-test/r/grant.result: removed nondeterminism (unspecified order) in some test output mysql-test/r/view_grant.result: Somewhat extended test case for the bug and similar queries. mysql-test/t/grant.test: removed nondeterminism (unspecified order) in some test output mysql-test/t/view_grant.test: Somewhat extended test case for the bug and similar queries. sql/mysql_priv.h: A wrapper for setup_tables that also checks access to the tables sql/sql_acl.cc: removed artificial security check stop and used the table ref's credentials. sql/sql_base.cc: a wrapper for setup_tables to check access to the tables sql/sql_delete.cc: wrapper called. sql/sql_insert.cc: wrapper called sql/sql_load.cc: wrapper called sql/sql_parse.cc: wrapper called and artificial check stop removed sql/sql_select.cc: wrapper called sql/sql_update.cc: wrapper called sql/table.cc: Mask table access to the view error as well.
| * | | | Merge mysql.com:/home/kgeorge/mysql/5.0/cleanunknown2006-05-262-2/+14
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kgeorge/mysql/5.0/B14875
| | * | | Bug #14875: Bad view DEFINER makes SHOW CREATE VIEW failunknown2006-05-262-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading a view definition from a .frm file it was throwing a SQL error if the DEFINER user is not defined. Changed it to a warning to match the (documented) case when a view with undefined DEFINER user is created. mysql-test/r/view_grant.result: test case for the bug mysql-test/t/view_grant.test: test case for the bug sql/sql_acl.cc: Initialized the members to no privileges so even if the subsequent checks fail it will still initialize the security context. sql/table.cc: Turned the error of undefined DEFINER user in reading a view definition to a warning.
* | | | | ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]unknown2006-05-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_ndbcluster.cc: compile fix for Solaris 10 AMD64 -max GCC
* | | | | Merge mysql.com:/space/pekka/ndb/version/my50unknown2006-05-251-19/+25
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my50-bug14509
| * | | | Merge mysql.com:/space/pekka/ndb/version/my50unknown2006-05-251-19/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my50-bug14509 ndb/src/ndbapi/DictCache.cpp: Auto merged ndb/src/ndbapi/DictCache.hpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
| | * | | | ndb - bug#14509 [related] re-do auto-incr error handlingunknown2006-05-171-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/Ndb.hpp: make auto-incr methods return int 0/-1 ndb/src/ndbapi/Ndb.cpp: make auto-incr methods return int 0/-1 ndb/src/ndbapi/NdbDictionaryImpl.cpp: make auto-incr methods return int 0/-1 ndb/test/ndbapi/testDict.cpp: make auto-incr methods return int 0/-1 ndb/tools/restore/consumer_restore.cpp: make auto-incr methods return int 0/-1 sql/ha_ndbcluster.cc: make auto-incr methods return int 0/-1
| | * | | | ndb - bug#14509 [related] setAutoIncrement: add error handlingunknown2006-05-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/Ndb.hpp: setAutoIncrement: add error handling ndb/src/ndbapi/Ndb.cpp: setAutoIncrement: add error handling ndb/src/ndbapi/NdbDictionaryImpl.cpp: setAutoIncrement: add error handling ndb/tools/restore/consumer_restore.cpp: setAutoIncrement: add error handling sql/ha_ndbcluster.cc: setAutoIncrement: add error handling
* | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-252-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kgeorge/mysql/5.0/clean
| * \ \ \ \ \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleanunknown2006-05-252-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kgeorge/mysql/5.0/B19700 sql/item.h: Auto merged
| | * | | | | Bug #19700: subselect returning BIGINT always returned it as SIGNEDunknown2006-05-252-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unsigned flag in Item was not propagated through the single value subqueries. This caused the result to be treated as signed. mysql-test/r/subselect.result: Added testcases for bug #19700 mysql-test/t/subselect.test: Added testcases for bug #19700 sql/item.h: Preserved the unsigned flag in Item_subselect sql/item_subselect.cc: Preserved the unsigned flag in Item_subselect
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-244-14/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | | | | | Merge monty@192.168.0.9:/my/mysql-5.0unknown2006-05-244-14/+47
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 sql/mysqld.cc: Auto merged
| | * | | | | | More DBUG statementsunknown2006-05-244-14/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait() The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads. This fixes: Bug#16986: Deadlock condition with MyISAM tables Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock mysql-test/r/flush.result: Added test case for deadlock with FLUSH TABLES WITH READ LOCK mysql-test/r/lock_multi.result: Test for bug in LOCK TABLE + optimize table mysql-test/t/flush.test: Added test case for deadlock with FLUSH TABLES WITH READ LOCK mysql-test/t/lock_multi.test: Test for bug in LOCK TABLE + optimize table sql/lock.cc: Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait() The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads sql/mysql_priv.h: Added COND_global_read_lock sql/mysqld.cc: Added COND_global_read_lock sql/sql_base.cc: More DBUG statements Added a broadcast in remove_table_from_cache() to release any threads waiting in open
* | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-241-2/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
| * | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-241-2/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0 sql/sql_table.cc: Auto merged
| | * | | | | | | BUG#17001 - Table and server crash on ALTER TABLEunknown2006-05-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frm and data files for tables created by earlier MySQL versions becomes out of sync after certain ALTER TABLE statements: - One that changes column default value; - One that changes table comment; - One that changes table password. As a result one can expirience either server crash or data corruption/loss. This fix ensures that running ALTER TABLE on tables created by earlier MySQL versions recreates data files. sql/sql_table.cc: Ensure that running ALTER TABLE on tables created by earlier MySQL versions recreates data files.
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-247-72/+51
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | | | | | | Remove dflt_field from field structure as this was only needed when ↵unknown2006-05-247-72/+51
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089) Fixed compiler warnings Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490) sql/field.cc: remove dflt_field from field structure (not needed) Simple cleanup of code that been copied elsewhere sql/field.h: remove dflt_field from field structure (not needed) sql/item.h: Removed compiler warnings sql/item_timefunc.cc: Fixed Item_date_add_intervall::eq The problem was that when we call 'eq' 'this' is not fixed, which means we can't call const_item() or a value function. I fixed this so that we check eq for all arguments and that the sign and type are identical. (The original code gave a 'accessing uninitialized data' in valgrind. sql/mysql_priv.h: Added default fields to create_tmp_field sql/sql_insert.cc: New default_field parameter to create_tmp_field() sql/sql_select.cc: New default_field parameter to create_tmp_field() Use this in create_tmp_table() to set right default value for a field
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.0--bug11151 sql/sp_head.cc: Auto merged
| * | | | | | | Guilhelm suggested that the "load data infile" command should be flagged asunknown2006-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not transaction-safe for stored procedures. Related to Bug#11151. sql/sp_head.cc: Guilhelm suggested that the "load data infile" command should be flagged as not transaction-safe for stored procedures.
* | | | | | | | Bug#19938 Valgrind error (race) in handle_slave_sql()unknown2006-05-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/slave.cc: Read the value of rli->events_till_abort only in debug compile
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2006-05-232-2/+22
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 mysql-test/t/information_schema.test: Auto merged
| * | | | | | | Bug #19938 Valgrind error (race) in handle_slave_sql()unknown2006-05-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/slave.cc: Read rli->events_till_abort to a temporary variable before unlocking the mutex
| * | | | | | | Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143unknown2006-05-231-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/slave.cc: Exclude
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711unknown2006-05-231-1/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 sql/mysqld.cc: Auto merged
| | * | | | | | | Add comment for 'kill_server' functionunknown2006-05-231-1/+14
| | | | | | | | |
| * | | | | | | | Bug#19938 Valgrind error (race) in handle_slave_sql()unknown2006-05-231-2/+11
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Unlock the mutex after looking at rli->events_till_abort - Already fixed in 5.1 so it will be null merged. sql/slave.cc: Unlock the mutex after looking at rli->events_till_abort
* | | | | | | | Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL modeunknown2006-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transfer NO_DEFAULT_VALUE_FLAG flag to new field mysql-test/r/strict.result: Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode test case mysql-test/r/type_ranges.result: Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode result fix mysql-test/t/strict.test: Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode test case
* | | | | | | | Bug#16681 information_schema shows forbidden VIEW detailsunknown2006-05-231-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show view definition to users that have the needed privilleges mysql-test/r/information_schema.result: Bug#16681 information_schema shows forbidden VIEW details test case mysql-test/t/information_schema.test: Bug#16681 information_schema shows forbidden VIEW details test case
* | | | | | | | Post-review fixes for bug #19089unknown2006-05-223-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/view.result: Post-review fixes. sql/field.cc: Post-review fixes. sql/field.h: Post-review fixes. sql/sql_select.cc: Post-review fixes.
* | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2006-05-203-6/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 sql/sql_select.cc: Auto merged mysql-test/r/view.result: Manual merge mysql-test/t/view.test: Manual merge
| * | | | | | | Fixed bug #19089.unknown2006-05-203-6/+34
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a CREATE TABLE command created a table from a materialized view id does not inherit default values from the underlying table. Moreover the temporary table used for the view materialization does not inherit those default values. In the case when the underlying table contained ENUM fields it caused misleading error messages. In other cases the created table contained wrong default values. The code was modified to ensure inheritance of default values for materialized views. mysql-test/r/view.result: Added a test case for bug #19089. mysql-test/t/view.test: Added a test case for bug #19089. sql/field.cc: Fixed bug ##19089. Added field dflt_field to the class Field. This field is set for temp table fields that inherits default values of items from which they are created. sql/field.h: Fixed bug ##19089. Added field dflt_field to the class Field. This field is set for temp table fields that inherits default values of items from which they are created. sql/sql_select.cc: Fixed bug #19089. When a CREATE TABLE command created a table from a materialized view id does not inherit default values from the underlying table. Moreover the temporary table used for the view materialization does not inherit those default values. The code was modified to ensure inheritance of default values for materialized views.
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-1039unknown2006-05-194-4/+98
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged include/sslopt-longopts.h: Resolve conflict include/sslopt-vars.h: Resolve conflict mysql-test/r/variables.result: Resolve conflict mysql-test/t/variables.test: Resolve conflict
| * | | | | | | Bug #1039: tmpdir and datadir not available via @@ system variable syntaxunknown2006-05-084-4/+98
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #19606: ssl variables are not displayed in show variables Bug #19616: log_queries_not_using_indexes is not listed in show variables Make basedir, datadir, tmpdir, log_queries_not_using_indexes, ssl_ca, ssl_capath, ssl_cert, ssl_cipher, and ssl_key all available both from SHOW VARIABLES and as @@variables. As a side-effect of this change, log_queries_not_using_indexes can be changed at runtime (but only globally, not per-connection). include/sslopt-longopts.h: Put options in alphabetical order include/sslopt-vars.h: Allow define of SSL_VARS_NOT_STATIC to prevent variables from not being made static. mysql-test/r/variables.result: Add new results mysql-test/t/variables.test: Add new regression tests sql/mysql_priv.h: Add extern for opt_log_queries_not_using_indexes sql/mysqld.cc: Handle opt_log_queries_not_using_indexes as extern, and define SSL_VARS_NO_STATIC so they can be accessed outside of mysqld.cc sql/set_var.cc: Handle basedir, datadir, tmpdir, log_queries_not_using_indexes, and various ssl settings so that they are accessible as server variables and listed in SHOW VARIABLES. sql/set_var.h: Add new sys_var_constr_str_ptr class, for when we have a system variable that is only set via the command-line that is a pointer to a string.
* | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-191-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into devsrv-b.mysql.com:/users/msvensson/mysql-5.0 sql/mysqld.cc: Auto merged
| * \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711unknown2006-05-191-1/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 include/my_pthread.h: Auto merged sql/mysqld.cc: Auto merged
| | * | | | | Bug#15869 Cannot shutdown the server - it restartsunknown2006-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - A segfault occured when the function 'kill_server' called 'my_sigset' with signal number 0. 'my_sigset' is a macro which uses 'sigaction' to install the signal handler with an invalid signal number will on most platforms return EINVAL but yields a segfauilt on IRIX 6.5 - The server crash was detected by mysqld_safe and it was restarted although a shutdown was requested. - Semantics of kill_server(0) is not known, leaving it intact include/my_pthread.h: Check return value from sigaction with a DBUG_ASSERT Also DBUG_ASSERT if signal number 0 is passed sql/mysqld.cc: Don't call my_sigset if signo is 0
* | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-5.0
| * | | | | | | Bug #13975: "same string" + 0 has 2 different resultsunknown2006-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'decimals' member of Item_func was being improperly initialized, which resulted in improper results when handling large numeric values. mysql-test/r/func_str.result: Add test results mysql-test/t/func_str.test: Add new regression test sql/item_strfunc.h: Remove unnecessary reset of decimals in Item_func_conv::fix_length_and_dec().
* | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2006-05-185-5/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-2 sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/r/view.result: SCCS merged mysql-test/t/view.test: SCCS merged
| * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-185-5/+30
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/19077-bug-5.0-mysql
| | * | | | | | | Fixed bug#19077: A nested materialized derived table is used before being ↵unknown2006-05-185-5/+30
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | populated. The convert_constant_item() function converts constant items to ints on prepare phase to optimize execution speed. In this case it tries to evaluate subselect which contains a derived table and is contained in a derived table. All derived tables are filled only after all derived tables are prepared. So evaluation of subselect with derived table at the prepare phase will return a wrong result. A new flag with_subselect is added to the Item class. It indicates that expression which this item represents is a subselect or contains a subselect. It is set to 0 by default. It is set to 1 in the Item_subselect constructor for subselects. For Item_func and Item_cond derived classes it is set after fixing any argument in Item_func::fix_fields() and Item_cond::fix_fields accordingly. The convert_constant_item() function now doesn't convert a constant item if the with_subselect flag set in it. mysql-test/t/view.test: Added test case for bug#19077: A nested materialized derived table is used before being populated. mysql-test/t/subselect.test: Added test case for bug#19077: A nested materialized derived table is used before being populated. mysql-test/r/view.result: Added test case for bug#19077: A nested materialized derived table is used before being populated. mysql-test/r/subselect.result: Added test case for bug#19077: A nested materialized derived table is used before being populated. sql/item_subselect.cc: Fixed bug#19077: A nested materialized derived table is used before being populated. The Item_subselect class constructor sets new with_subselect flag to 1. sql/item_func.cc: Fixed bug#19077: A nested materialized derived table is used before being populated. The Item_func::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments. sql/item_cmpfunc.cc: Fixed bug#19077: A nested materialized derived table is used before being populated. The convert_constant_item() function now doesn't convert a constant item with the with_subselect flag set. The Item_cond::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments. sql/item.cc: Fixed bug#19077: A nested materialized derived table is used before being populated. Set new with_subselect flag to default value - 0 in the Item constructor. sql/item.h: Fixed bug#19077: A nested materialized derived table is used before being populated. A new flag with_subselect is added to the Item class. It indicates that expression which this item represents is a subselect or contains a subselect. It is set to 0 by default.
* | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2006-05-172-2/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
| * | | | | | | Fixed bug #19816.unknown2006-05-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was introduced when the patch resolving the performance problem 17164 was applied. As a result of that modification the not_null_tables attributes were calculated incorrectly for constant OR conditions. This triggered invalid conversion of outer joins into inner joins. mysql-test/r/join_outer.result: Added a test case for bug #19816. mysql-test/t/join_outer.test: Added a test case for bug #19816.