summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* A fix (bug #10568: Function 'LAST_DAY(date)' does not return NULL for ↵unknown2005-06-013-1/+24
| | | | | | | | invalid argument). sql/item_timefunc.cc: A fix (bug #10568: Function 'LAST_DAY(date)' does not return NULL for invalid argument). Return error for partial dates as well.
* Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure nameunknown2005-05-315-0/+30
| | | | | | | | | | | | | | | | | | during creation. Although it returns an error, consistent with the behaviour for other objects. (Unclear why we would allow the creation of SPs with truncated names.) mysql-test/r/sp-error.result: New test case for BUG#9529. mysql-test/t/sp-error.test: New test case for BUG#9529. sql/sp.cc: Check SP name length on creation (and drop). sql/sp.h: New status code for bad (too long) name. sql/sql_parse.cc: New status code for bad (too long) name.
* Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2005-05-314-7/+185
|\ | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 sql/item.cc: Auto merged sql/sql_select.cc: Auto merged
| * olap.result:unknown2005-05-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #10982. item.cc: Fixed bug #10982. In the function Item_ref::val_decimal by mistake the method Item_ref::val_decimal was used instead of Item_ref::val_decimal_result. sql/item.cc: Fixed bug #10982. In the function Item_ref::val_decimal by mistake the method Item_ref::val_decimal was used instead of Item_ref::val_decimal_result. mysql-test/r/olap.result: Fixed bug #10982.
| * olap.result:unknown2005-05-311-6/+6
| | | | | | | | | | | | | | | | Post merge corrections. mysql-test/r/olap.result: Post merge corrections.
| * Manual post mergeunknown2005-05-303-10/+188
| |\ | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/olap.test: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/olap.result: Manual merge
| | * sql_select.cc:unknown2005-05-301-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | Post-review modifications for the fix of bug #7894. sql/sql_select.cc: Post-review modifications for the fix of bug #7894.
| | * olap.result, olap.test:unknown2005-05-303-6/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test cases for bug #7894. sql_select.cc: Fixed bug #7894: GROUP BY queries with ROLLUP returned wrong results for expressions containing group by columns. The fix ensured correct results by replacement of all occurrences of group by fields in non-aggregate expressions for corresponding ref objects and preventing creation of fields in temporary tables for expression containing group by fields. sql/sql_select.cc: Fixed bug #7894: GROUP BY queries with ROLLUP returned wrong results for expressions containing group by columns. The fix ensured correct results by replacement of all occurrences of group by fields in non-aggregate expressions for corresponding ref objects and preventing creation of fields in temporary tables for expression containing group by fields. mysql-test/t/olap.test: Added test cases for bug #7894. mysql-test/r/olap.result: Added test cases for bug #7894.
* | | Small bug fix in SP item reusal (debug mode only).unknown2005-05-311-2/+2
| | | | | | | | | | | | | | | sql/item.cc: Get the size before trashing (in debug mode only).
* | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-05-3121-112/+371
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pem/work/mysql-5.0 sql/item_subselect.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged
| * \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-312-4/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
| | * | | Fix for bug#10059: SHOW TABLE STATUS FROM `information_schema`; reports ↵unknown2005-05-312-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uppercase table names information schema table names are always upper case table names
| * | | | Merge mysql.com:/space/my/mysql-5.0.6-cloneunknown2005-05-310-0/+0
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-build support-files/mysql.spec.sh: Auto merged
| | * | | Added a missing "make clean" to the RPM "spec" file which had caused the ↵unknown2005-05-261-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original 4.1.12 RPMs to be broken. (bug#10674, bug#10681) support-files/mysql.spec.sh: Added a missing "make clean" which had caused the original 4.1.12 RPMs to be broken. (bug#10674, bug#10681)
| * | | | One more post-review fix.unknown2005-05-301-3/+2
| | | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-3017-104/+69
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-7306-new sql/sql_delete.cc: Auto merged
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-3017-104/+69
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-7306-new sql/item_subselect.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged
| | | * | | Preparatory (and the most problematic) patch for Bug#7306unknown2005-05-3017-104/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "the server side preparedStatement error for LIMIT placeholder", which moves all uses of LIMIT clause from PREPARE to OPTIMIZE and later steps. After-review fixes. mysql-test/r/group_min_max.result: Test results fixed for EXPLAINs when using GROUP_MIN_MAX access plan. sql/item_subselect.cc: Move setting of the internal LIMIT used for IN/ALL/ANY/EXISTS subqueries to one place: Item_exists_subselect::fix_length_and_dec(). This implies that unit->select_limit_cnt is not set until the item is fixed. This is OK, as now LIMIT values are not used until JOIN::optimize. sql/mysql_priv.h: setup_tables no longer needs a special flag for the case when it's called from JOIN::reinit() (we don't need to call setup_tables between two executions of a correlated subquery). sql/opt_range.cc: Fix a glitch in GROUP_MIN_MAX access plan: we should use table metadata, not field data, to evaluate max_used_key_length, which is then used for explain. sql/sp.cc: - setup_tables signature changed. sql/sql_base.cc: - setup_tables no longer needs a special mode for subqueries. Unused checks were removed. sql/sql_delete.cc: - setup_tables signature changed sql/sql_help.cc: - setup_tables signature changed sql/sql_insert.cc: - setup_tables signature changed sql/sql_lex.cc: Consolidate setting of internal LIMIT for IN/ALL/ANY/EXISTS subqeries in one place, and hence remove it from st_select_lex::test_limit(). sql/sql_lex.h: Cleanup signature of st_select_lex_unit::init_prepare_fake_select_lex(). sql/sql_load.cc: - setup_tables signature changed sql/sql_olap.cc: - setup_tables signature changed sql/sql_parse.cc: - st_select_lex_unit::set_limit() signature changed sql/sql_select.cc: Move setting of JOIN::select_limit from JOIN::prepare to JOIN::optimize. At prepare, limit is unknown yet. Remove excessive cleanups from JOIN::reinit which were overwriting join->join_tab[i]->table->used_keys. This fixes the bug which was triggered by the change in item_subselect.cc. sql/sql_union.cc: Class st_select_lex_unit was changed to avoid calls to st_select_lex_unit::set_limit from places where it may be unknown. Now unit->select_limit_cnt is set at ::exec(). st_select_lex_unit::init_prepare_fake_select_lex(): - move out set_limit functionality - remove a few lines of dead code. st_select_lex_unit::prepare(): - now we don't call set_limit at the time of prepare, so the value of unit->select_limit_cnt may be unknown here. Use sl->select_limit instead. st_select_lex_unit::exec(): - cleanup - call set_limit explicitly as it has been moved out of init_prepare_fake_select_lex. sql/sql_update.cc: - setup_tables signature changed
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-303-2/+296
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
| | * | | | Added test for bug #5894 "Triggers with altered tables cause corruptunknown2005-05-303-2/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | databases" and basic handling of errors which happen in triggers. (The bug itself was fixed by several previous patches). Fixed bug in multi-delete which were exposed by these tests. mysql-test/r/trigger.result: Added test for bug #5894 "Triggers with altered tables cause corrupt databases" and basic handling of errors which happen in triggers. mysql-test/t/trigger.test: Added test for bug #5894 "Triggers with altered tables cause corrupt databases" and basic handling of errors which happen in triggers. sql/sql_delete.cc: multi_delete::send_eof(): Fixed bug which were exposed by testing of basic handling of errors in triggers. Error which happened in multi_delete::do_deletes() was wiped out by thd->clear_error() and thus never sent to client (and this stalled client connection).
* | | | | | Post-review fixes of BUG#9937: Crash on call to stored procedure.unknown2005-05-318-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_cmpfunc.cc: Put the buff parameter back in check_stack_overrun(). sql/item_func.cc: Put the buff parameter back in check_stack_overrun(). sql/item_subselect.cc: Put the buff parameter back in check_stack_overrun(). sql/mysql_priv.h: Put the buff parameter back in check_stack_overrun(). sql/mysqld.cc: Style fixes. sql/sp_head.cc: Put the buff parameter back in check_stack_overrun(). sql/sql_parse.cc: Put the buff parameter back in check_stack_overrun(), and added comment explaining the purpose. sql/table.cc: Put the buff parameter back in check_stack_overrun().
* | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-05-3013-23/+91
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pem/work/mysql-5.0 sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_subselect.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | Fixed BUG#8409: Stored procedure crash if function contains FLUSHunknown2005-05-273-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by simply disabling FLUSH for stored functions. (I can't really work.) mysql-test/r/sp-error.result: New test case for BUG#8409. mysql-test/t/sp-error.test: New test case for BUG#8409. sql/sql_yacc.yy: Disable FLUSH for stored functions.
| * | | | | Fixed BUG#9559: Functions: Numeric Operations using -ve value gives incorrectunknown2005-05-273-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | results. Actually a problem when converting decimal to int for user variables. mysql-test/r/sp.result: New test case for BUG#9559. mysql-test/t/sp.test: New test case for BUG#9559. sql/item_func.cc: Don't set the unsigned flag when converting decimal user var to int.
| * | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-05-278-22/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pem/work/mysql-5.0 sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
| | * | | | | Fixed BUG#9937: Crash on call to stored procedure.unknown2005-05-268-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only showed up on two known platforms, both ia64 (one HP-UX and one Linux wich icc). For some reason, they only get half the stack size they are supposed to have, which makes deep SP recursion overrun the stack before check_stack_overrun() is triggered. Also made som minor fixes in the check_stack_overrun() definition, supporting variable margins. No test case added, but the reason for the bug report was a failed existing test case on these machines, which now works. sql/item_cmpfunc.cc: Adopted call to new check_stack_overrun() definition. sql/item_func.cc: Adopted calls to new check_stack_overrun() definition. sql/item_subselect.cc: Adopted call to new check_stack_overrun() definition. sql/mysql_priv.h: Changed definition of check_stack_overrun(), thread_stack_min variable no longer needed. sql/mysqld.cc: thread_stack_min variable no longer needed (with variable margin arg. to check_thread_overrun()). On (at least some) ia64 machines, it seems we only get half the requested stack in reality, so deep SP recursion crashes before the thread overrun check is triggered. We work around this by requesting twice the stack requested to get expected size. sql/sp_head.cc: Adopted call to new check_stack_overrun() definition, and use a wider margin execution. sql/sql_parse.cc: Modified check_stack_overrun() definition. Removed unused arg that didn't sever any purpose, and added a 'margin' argument to support different margins for different callrers. sql/table.cc: Adopted call to new check_stack_overrun() definition.
* | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-303-6/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/mysql-5.0-bug-9593 sql/sql_select.cc: Auto merged
| * | | | | | | Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock theunknown2005-05-303-6/+29
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server" Bug appears only on Windows platform. Freeing memory in TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in setup_copy_fields() results in memory destruction. In test IF used instead of CONCAT because IF have more stable crash. sql/sql_select.cc: Fix bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server mysql-test/t/count_distinct.test: test for bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server mysql-test/r/count_distinct.result: Test for bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server
* | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-05-284-4/+163
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * \ \ \ \ \ \ Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-284-4/+163
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into radha.local:/Users/patg/mysql-5.0
| | * | | | | | | Comment and test changes per review request by Timour. All tests pass on ↵unknown2005-05-273-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | production with this code. mysql-test/r/federated.result: added explain results to join test results per Timour's request. mysql-test/t/federated.test: Added explain to test per Timour's request sql/ha_federated.cc: better comment to explain why we need table->status set to 0
| | * | | | | | | changes to fix joins not working (bug #10848). New tests, as well as ↵unknown2005-05-254-4/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table->status being set in index_read_idx mysql-test/r/federated.result: new join test results mysql-test/t/federated.test: new simple join tests (more to come with subsequent commits) sql/ha_federated.cc: This fixes joins not working. Monty discussed that having to deal with table->status needs to be moved from the handler/storage engine to a higher level BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | | | | mergedunknown2005-05-284-1/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | innobase/row/row0mysql.c: Auto merged sql/hash_filo.h: Auto merged
| * | | | | | | forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliuresunknown2005-05-271-1/+1
| | | | | | | |
| * | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-05-271-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/ha_innodb.cc: Auto merged
| | * | | | | | | don't downgrade the lock for CREATE ... SELECT (bug#6678)unknown2005-05-271-1/+2
| | | | | | | | |
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-265-17/+53
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 sql/item.cc: Auto merged
| | * \ \ \ \ \ \ \ Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-261-15/+22
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| | | * \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-261-15/+22
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | * | \ \ \ \ \ \ \ \ mergeunknown2005-05-263-2/+26
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.cc: Auto merged
| | | * | | | | | | | | fixed problem with long string results of expressions in UNIONS (BUG#10025)unknown2005-05-263-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/union.result: test for Bug #10025 mysql-test/t/union.test: test for Bug #10025 sql/item.cc: set HA_OPTION_PACK_RECORD and change type to MYSQL_TYPE_STRING, to allow correct field creation in case of length more then 255 (creation STRING field with length more then 255)
| | * | | | | | | | | | Merge hundin.mysql.fi:/home/marko/k/mysql-4.0unknown2005-05-261-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1 innobase/row/row0mysql.c: Auto merged
| | | * | | | | | | | | | InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335).unknown2005-05-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/row/row0mysql.c: row_drop_table_for_mysql(): Check all referencing tables when drop_db==TRUE (Bug #10335)
* | | | | | | | | | | | | - fixed the "test-force" target in the toplevel Makefile.am for systems on whichunknown2005-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "." is not in the PATH... Makefile.am: - fixed the "test-force" target for systems on which "." is not in the PATH...
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-276-5/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 sql/sql_parse.cc: Auto merged
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug9993unknown2005-05-276-5/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged
| | * | | | | | | | | | | | | BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tablesunknown2005-05-266-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Dont perform automatic privilege handling for stored procedures when server is started --skip-grant-tables - Renamed view_skip_grants to skip_grants and added test cases for this mysql-test/t/skip_grants-master.opt: Rename: mysql-test/t/view_skip_grants-master.opt -> mysql-test/t/skip_grants-master.opt mysql-test/r/skip_grants.result: Added test for create and drop procedure with --skip-grant-tables mysql-test/t/skip_grants.test: Added test for create and drop procedure with --skip-grant-tables sql/mysql_priv.h: Make opt_noacl global sql/mysqld.cc: Make opt_noacl global sql/sql_parse.cc: On ly perform automatic privilege add/revoke if server is not started with --skip-grant-tables
* | | | | | | | | | | | | | | ha_innodb.cc:unknown2005-05-271-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check in Jan's fix to bug #10746 and also add a note to ::start_stmt() that stored procs in 5.0 call it sql/ha_innodb.cc: Check in Jan's fix to bug #10746 and also add a note to ::start_stmt() that stored procs in 5.0 call it
* | | | | | | | | | | | | | | Fix for bug #9992: mysql_next_result hangs on errorunknown2005-05-272-3/+24
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set net->no_send_error to 0 before execution of each element of multiquery statement to provide the sending of error to client tests/mysql_client_test.c: Fix for bug #9992: mysql_next_result hangs on error test case
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-273-12/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-ttdf sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_yacc.yy: Auto merged