- 30 May, 2005 2 commits
-
-
unknown authored
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
-
unknown authored
"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
-
- 29 May, 2005 2 commits
-
-
unknown authored
into moonbone.local:/work/mysql-5.0-bug-9593 sql/sql_select.cc: Auto merged
-
unknown authored
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
-
- 28 May, 2005 2 commits
- 27 May, 2005 15 commits
-
-
unknown authored
innobase/row/row0mysql.c: Auto merged sql/hash_filo.h: Auto merged
-
unknown authored
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
-
unknown authored
"." is not in the PATH... Makefile.am: - fixed the "test-force" target for systems on which "." is not in the PATH...
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0 sql/sql_parse.cc: Auto merged
-
unknown authored
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
-
unknown authored
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
-
unknown authored
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
-
unknown authored
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/ha_innodb.cc: Auto merged
-
unknown authored
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
-
unknown authored
-
unknown authored
We can't have Item_trigger_field as aggregated object inside of sp_instr_set_trigger_field class since in this case its destructor will be called twice. So instead let us create this Item separately and store pointer to it in instruction object. sql/sp_head.cc: sp_instr_set_trigger_field: We can't have Item_trigger_field as aggregated object since in this case its destructor will be called twice, so let us store pointer to this Item (Another way to avoid this is to exclude this Item from free_list but this can't be done in elegant way in 5.0 and will also cause additional problems with Item::cleanup()). sql/sp_head.h: sp_instr_set_trigger_field: We can't have Item_trigger_field as aggregated object since in this case its destructor will be called twice, so let us store pointer to this Item (Another way to avoid this is to exclude this Item from free_list but this can't be done in elegant way in 5.0 and will also cause additional problems with Item::cleanup()). sql/sql_yacc.yy: We can't have Item_trigger_field as aggregated object inside of sp_instr_set_trigger_field class since in this case its destructor will be called twice. So instead let us create this Item separately and store pointer to it in instruction object.
-
unknown authored
sql/hash_filo.h: USE_PRAGMA_INTERFACE sql/sp_cache.cc: USE_PRAGMA_IMPLEMENTATION sql/sp_cache.h: USE_PRAGMA_INTERFACE sql/sp_head.cc: USE_PRAGMA_IMPLEMENTATION sql/sp_head.h: USE_PRAGMA_INTERFACE sql/sp_pcontext.cc: USE_PRAGMA_IMPLEMENTATION sql/sp_pcontext.h: USE_PRAGMA_INTERFACE sql/sp_rcontext.cc: USE_PRAGMA_IMPLEMENTATION sql/sp_rcontext.h: USE_PRAGMA_INTERFACE
-
unknown authored
- Remove the expected warrnings when "show binary logs" are called on zero size binary log files. mysql-test/r/rpl_log.result: Remove the warnings that is no longer displayed when "show binary logs" is called on zero size log files. Checked against 4.0, no warnings there. mysql-test/r/rpl_rotate_logs.result: Remove the warnings that is no longer displayed when "show binary logs" is called on zero size log files. Checked against 4.0, no warnings there.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
- 26 May, 2005 19 commits
-
-
unknown authored
mysql-test/r/union.result: Convert back the latin1 characters that where accidently changed during last merge mysql-test/t/union.test: Convert back the latin1 characters that where accidently changed during last merge
-
unknown authored
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e: Auto merged BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e: Auto merged client/sql_string.cc: Auto merged client/sql_string.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysys/my_open.c: Auto merged mysys/raid.cc: Auto merged ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged sql/field.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_blackhole.cc: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_geofunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_uniq.cc: Auto merged sql/item_uniq.h: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/procedure.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol_cursor.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_udf.cc: Auto merged sql/tztime.cc: Auto merged sql/opt_range.cc: Manual merge sql/sql_parse.cc: Use select_lex pointer instead of lex->select_lex sql/sql_repl.cc: Function moved to log.cc, fix made there instead sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
- Add O_SHARE when opening file. sql/log.cc: Add O_SHARE when opening file. This is from mysql-4.1 but since function has been moved from sql_repl.cc, it was missed during merge.
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2 sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/structs.h: Auto merged
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-4.1 sql/item.cc: Auto merged
-
unknown authored
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
-
unknown authored
into mysql.com:/M41/mysql-4.1
-
unknown authored
into mysql.com:/M50/mysql-5.0 sql/item.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
sql/item.cc: Auto merged
-
unknown authored
mysql-test/r/select.result: Corrected merge error (two test blocks inserted in wrong order).
-
unknown authored
- 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
-
unknown authored
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)
-
unknown authored
into hundin.mysql.fi:/home/marko/mysql-4.1 innobase/row/row0mysql.c: Auto merged
-
unknown authored
innobase/row/row0mysql.c: row_drop_table_for_mysql(): Check all referencing tables when drop_db==TRUE (Bug #10335)
-
unknown authored
-
unknown authored
Moved detection of wrong decimal fields before decimal field was created to avoid ASSERT() for DECIMAL(1)
-
unknown authored
client/client_priv.h: Correction of merge mishandling.
-
unknown authored
mysql-test/t/select.test: SCCS merged
-