- 08 Dec, 2005 2 commits
-
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release mysql-test/t/symlink.test: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
Bug#14960, reverted code to make symdir work on Windows symlink.test: Disabled test case on Windows mysql-test/t/symlink.test: Disabled test case on Windows sql/mysqld.cc: Bug#14960, reverted code to make symdir work on Windows
-
- 07 Dec, 2005 10 commits
-
-
unknown authored
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-release
-
unknown authored
current SP tables locking make impossible view security" with main tree. mysql-test/r/sp-error.result: Fixed test result after merging fix for bug #11555 "Stored procedures: current SP tables locking make impossible view security" with main tree.
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2 mysql-test/r/view.result: Auto merged mysql-test/t/sp-error.test: Auto merged sql/sp_head.cc: Auto merged mysql-test/r/sp-error.result: SCCS merged
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2 mysql-test/r/sp-error.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged sql/sp_head.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sp.cc: Manual merge. sql/sp.h: Manual merge. sql/sql_base.cc: Manual merge.
-
unknown authored
impossible view security". We should not expose names of tables which are explicitly or implicitly (via routine or trigger) used by view even if we find that they are missing. So during building of list of prelocked tables for statement we track which routines (and therefore tables for these routines) are used from views. We mark elements of LEX::routines set which correspond to routines used in views by setting Sroutine_hash_entry::belong_to_view member to point to TABLE_LIST object for topmost view which uses routine. We propagate this mark to all routines which are used by this routine and which we add to this set. We also mark tables used by such routine which we add to the list of tables for prelocking as belonging to this view. mysql-test/r/sp-error.result: Added test for bug #11555 "Stored procedures: current SP tables locking make impossible view security". mysql-test/r/view.result: We should not expose tables which are expicitly/implicitly used in view in check table statement. mysql-test/t/sp-error.test: Added test for bug #11555 "Stored procedures: current SP tables locking make impossible view security". mysql-test/t/view.test: Removed comment obsoleted by bugfix. sql/sp.cc: We should not expose names of tables which are explicitly or implicitly (via routine or trigger) used by view even if we find that they are missing. So during building of list of prelocked tables for statement we track which routines (and therefore tables for these routines) are used from views. We mark elements of LEX::routines set which correspond to routines used in views by setting Sroutine_hash_entry::belong_to_view member to point to TABLE_LIST object for topmost view which uses routine. We propagate this mark to all routines which are used by this routine and which we add to this set. We also mark tables used by such routine which we add to the list of tables for prelocking as belonging to this view. sql/sp.h: sp_cache_routines_and_add_tables_for_view()/for_triggers(): To be able to determine correctly uppermost view which uses this view/table with trigger we have to pass pointer to TABLE_LIST object instead of pointer to view's LEX or to Table_triggers_list object. sql/sp_head.cc: sp_head::add_used_tables_to_table_list(): Added new argument which allows to mark tables which are added to table list for prelocking as belonging to view (this allows properly hide names of tables which are used in routines used by views). sql/sp_head.h: sp_head::add_used_tables_to_table_list(): Added new argument which allows to mark tables which are added to table list for prelocking as belonging to view (this allows properly hide names of tables which are used in routines used by views). sql/sql_base.cc: open_tables(): sp_cache_routines_and_add_tables_for_view()/for_triggers() now accept pointer to table list element as last argument, this allows them to determine correctly uppermost view which uses this view/table with trigger. sql/sql_trigger.h: Table_triggers_list: sp_cache_routines_and_add_tables_for_triggers() now accept pointer to table list element as last argument, this allows to determine correctly uppermost view which uses this table with trigger.
-
unknown authored
mysql-test/t/sp.test: Auto merged sql/sp_head.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into mysql.com:/home/timka/mysql/src/5.0-2486
-
unknown authored
mysql-test/r/innodb.result: Update result file
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean
-
- 06 Dec, 2005 12 commits
-
-
unknown authored
statement that generated a warning. (Bug #15510) sql-common/client.c: Reset warning_count in free_old_query(), don't stomp old value for it in cli_read_query_result(). tests/mysql_client_test.c: Add new regression test
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean sql/field.cc: Auto merged mysql-test/r/type_binary.result: Resolve conflicts mysql-test/t/type_binary.test: Resolve conflicts
-
unknown authored
prepared statement execute mysql-test/r/sp.result: Test results fixed: a fix for Bug#15392 mysql-test/t/sp.test: A test case for Bug#15392 "Server crashes during prepared statement execute". No test case for error in Item_func_set_user_var::update as the only possible one is OOM. sql/sp_head.cc: A fix for Bug#15392 "Server crashes during prepared statement execute": the bug was caused by mysql_change_db() call which was overwriting the error state of 'ret'. Later in the code, suv->fix_fields() would discover thd->net.report_error and return it without completing its work. As the return value of fix_fields() was ignored, the server would afterwards crash in suv->update(). The fix makes sure that a possible internal error is raised in reset_lex_and_exec_core and then is handled in sp_head::execute_procedure.
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
-
unknown authored
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss52
-
unknown authored
to crash". Changes from snapshot innodb-5.0-ss52. Note that buf_block_t::index should be protected by btr_search_latch or an s-latch or x-latch on the index page. btr_search_drop_page_hash_index(): Read block->index while holding btr_search_latch and use the cached value in the loop. Remove some redundant assertions. Also fix 13778. When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between foreign key references are compatible. Also added test cases to 9802. innobase/btr/btr0sea.c: Changes from innodb-5.0-ss52 innobase/dict/dict0dict.c: Changes from innodb-5.0-ss52 innobase/dict/dict0load.c: Changes from innodb-5.0-ss52 innobase/include/buf0buf.h: Changes from innodb-5.0-ss52 innobase/include/dict0dict.h: Changes from innodb-5.0-ss52 innobase/include/dict0load.h: Changes from innodb-5.0-ss52 innobase/include/rem0cmp.h: Changes from innodb-5.0-ss52 innobase/rem/rem0cmp.c: Changes from innodb-5.0-ss52 innobase/row/row0mysql.c: Changes from innodb-5.0-ss52 mysql-test/r/innodb.result: Changes from innodb-5.0-ss52 mysql-test/t/innodb.test: Changes from innodb-5.0-ss52 sql/ha_innodb.cc: Changes from innodb-5.0-ss52 sql/ha_innodb.h: Changes from innodb-5.0-ss52
-
unknown authored
mysql-test/r/sp-error.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: SCCS merged
-
unknown authored
into mysql.com:/home/timka/mysql/src/5.0-2486 sql/item.cc: Auto merged sql/item.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged
-
unknown authored
Changed variable type and added comment in sp.c. sql/sp.cc: Changed variable type and added comment. (Review fix)
-
unknown authored
into mysql.com:/usr/home/pem/bug14233/mysql-5.0 mysql-test/r/sp-error.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sp.cc: Auto merged sql/sp.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: SCCS merged
-
unknown authored
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug15512
-
unknown authored
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Only get_connect_address for connected nodes. (also cleanup whitespace)
-
- 05 Dec, 2005 13 commits
-
-
unknown authored
-
unknown authored
into mysql.com:/M50/mysql-5.0
-
unknown authored
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-Z
-
unknown authored
scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: Manual merge.
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.0 mysql-test/r/sp.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sp_head.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
Solution according to the comments made by Guilhem - rpl_relayrotate Remove the SHOW SLAVE STATUS It is not needed. - rpl_until, rpl_deadlock Omit the printing of the "Slave_IO_Running" value mysql-test/r/rpl_deadlock.result: Updated result mysql-test/r/rpl_relayrotate.result: Updated result mysql-test/r/rpl_until.result: Updated result mysql-test/t/disabled.def: Enabling of the testcases rpl_relayrotate, rpl_until, rpl_deadlock mysql-test/t/rpl_deadlock.test: Omit the printing of the "Slave_IO_Running" value mysql-test/t/rpl_relayrotate.test: Remove the SHWO STATUS SLAVE command mysql-test/t/rpl_until.test: Omit the printing of the "Slave_IO_Running" value
-
unknown authored
(Backport of an identical change from 5.0) support-files/mysql.spec.sh: We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary. The fully static RPM build on "build" also does not work with the bundled zlib. With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build") and the one already installed on the system for the "max" build which is also labeled "experimental". (Backport of an identical change from 5.0)
-
unknown authored
scripts/make_binary_distribution.sh: Auto merged
-
unknown authored
into mysql.com:/M50/mysql-5.0 mysql-test/t/alter_table.test: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Disable ps_protocol for multi statement
-
unknown authored
is not defined. client/mysql.cc: Fix missing \n in the --help header when HAVE_READLINE is not defined.
-
unknown authored
-
- 04 Dec, 2005 3 commits
-
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 client/mysql.cc: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f: Auto merged client/mysqlshow.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged netware/mysql_test_run.c: Merged from 4.1.
-
unknown authored
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 client/mysql.cc: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged isam/isamchk.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Merged from 4.0.
-