- 28 Oct, 2005 14 commits
-
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean sql/item_func.cc: Auto merged
-
unknown authored
mysql-test/r/type_newdecimal.result: Update result
-
unknown authored
into mysql.com:/usr/home/pem/bug14256/mysql-5.0 mysql-test/r/view.result: Auto merged mysql-test/r/view_grant.result: Merge fix. mysql-test/t/view_grant.test: Merge fix.
-
unknown authored
-
unknown authored
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
-
unknown authored
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin server-tools/instance-manager/listener.cc: Auto merged
-
unknown authored
server-tools/instance-manager/listener.cc: every new connection should have sufficient thread stack to handle all IM commands server-tools/instance-manager/manager.cc: change stack size of listener and guardian threads server-tools/instance-manager/priv.cc: Add a new function, which is a wrapper around pthread_create to increase the stack size server-tools/instance-manager/priv.h: declare new function
-
unknown authored
Changed the parser test for wildcards in hostname to checking for empty strings instead (analogous with the test in default_view_definer()), since wildcards do appear in the definer's host-part sometimes. mysql-test/r/view.result: Updated result. mysql-test/r/view_grant.result: Added test for BUG#14256. mysql-test/t/view.test: Changed test for explicit definer; wildcards in host are ok, empty host-part is not. mysql-test/t/view_grant.test: Added test for BUG#14256. sql/sql_yacc.yy: Changed test for wildcards in hostpart of explicit view definer to test for empty host part instead. (Analogous with sql_parse.cc:default_view_definer().)
-
unknown authored
-
unknown authored
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0 sql/item.cc: Auto merged sql/sql_update.cc: Auto merged
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/t/func_math.test: Auto merged mysql-test/r/func_math.result: Resolve conflict sql/item_func.cc: Resolve conflict
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
-
unknown authored
Added "base64.h" to enable "make dist" to work include/Makefile.am: Added "base64.h" to enable "make dist" to work
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
-
- 27 Oct, 2005 26 commits
-
-
unknown authored
mysql-test/r/insert_select.result: Merge from 4.1 to 5.0. mysql-test/r/select.result: Merge from 4.1 to 5.0. mysql-test/t/insert_select.test: Merge from 4.1 to 5.0. mysys/my_handler.c: Merge from 4.1 to 5.0. sql/item.cc: Merge from 4.1 to 5.0. sql/item_timefunc.cc: Imported bug fix from 4.1 to 5.0. (Bug#14016) sql/item_timefunc.h: Imported bug fix from 4.1 to 5.0. (Bug#14016)
-
unknown authored
sql/item_func.cc: fixed typo sql/sql_acl.cc: comment fixed sql/sql_parse.cc: comment fixed sql/sql_view.cc: layout fixed sql/table.cc: typo fixed layout fixed sql/table.h: typo fixed
-
unknown authored
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0 mysql-test/r/information_schema.result: Auto merged mysql-test/r/sp.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_view.cc: Auto merged
-
unknown authored
mysql-test/r/information_schema.result: error message changed mysql-test/r/sp.result: error message changed mysql-test/r/sql_mode.result: fixed test suite mysql-test/r/view.result: error message changed mysql-test/r/view_grant.result: test of underlying view tables check mysql-test/t/sql_mode.test: fixed test suite mysql-test/t/view_grant.test: test of underlying view tables check sql/item.cc: check of underlying tables privilege added sql/item.h: Name the resolution context points to the security context of view (if item belong to the view) sql/item_func.cc: a view error hiding for execution of prepared function belonged to a view fixed checking privileges if stored functions belonds to some view sql/mysql_priv.h: refult of derived table processing functions changed to bool Security_context added as an argument to find_field_in_table() sql/share/errmsg.txt: error message fixed sql/sql_acl.cc: Storing requested privileges of tables added View underlying tables privilege check added sql/sql_base.cc: View underlying tables privilege check added sql/sql_cache.cc: Code cleunup: we should not register underlying tables of view second time sql/sql_delete.cc: ancestor -> merge_underlying_list renaming sql/sql_derived.cc: refult of derived table processing functions changed to bool do not give SELECT_ACL for TEMPTABLE views sql/sql_lex.h: The comment added sql/sql_parse.cc: registration of requested privileges added sql/sql_prepare.cc: registration of requested privileges added sql/sql_update.cc: manipulation of requested privileges for underlying tables made the same as for table which we are updating sql/sql_view.cc: underlying tables of view security check support added sql/table.cc: renaming and fixing view preparation methods, methods for checking underlyoing tables security context added sql/table.h: storege for reuested privileges added
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp heap/_check.c: Auto merged heap/hp_create.c: Auto merged include/config-netware.h: Auto merged include/my_base.h: Auto merged include/my_handler.h: Auto merged include/myisam.h: Auto merged innobase/include/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_delete.c: Auto merged myisam/mi_rnext_same.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamdef.h: Auto merged myisam/sort.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/update.test: Auto merged mysys/my_getopt.c: Auto merged mysys/my_handler.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/records.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_select.cc: Auto merged sql/structs.h: Auto merged strings/conf_to_src.c: Auto merged strings/ctype-win1250ch.c: Auto merged Makefile.am: Merged from 4.1 myisam/myisamchk.c: Merged from 4.1 mysql-test/mysql-test-run.pl: Merged from 4.1 mysql-test/r/insert_select.result: Merged from 4.1 mysql-test/r/myisam.result: Merged from 4.1 mysql-test/r/select.result: Merged from 4.1 mysql-test/t/insert_select.test: Merged from 4.1 mysql-test/t/myisam.test: Merged from 4.1 netware/mysql_test_run.c: Merged from 4.1 sql/item.cc: Merged from 4.1 sql/mysqld.cc: Merged from 4.1 sql/sql_update.cc: Merged from 4.1 tests/mysql_client_test.c: Merged from 4.1
-
unknown authored
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb (Note that archive_gis.test fails, but this is independent of this patch) client/mysqldump.c: Add DROP TABLE to be able to re-run mysqldump if it fails after 'table-named-as-view' is created mysql-test/include/gis_generic.inc: Remove dependency of ndb mysql-test/include/have_archive.inc: Fix syntax mysql-test/include/have_geometry.inc: Fix syntax mysql-test/r/mysqldump.result: New test results after adding 'drop table' mysql-test/t/archive_gis.test: gis_generic tests for have_geometry.inc mysql-test/t/bdb_gis.test: gis_generic tests for have_geometry.inc mysql-test/t/innodb_gis.test: gis_generic tests for have_geometry.inc mysql-test/t/ndb_gis.test: gis_generic tests for have_geometry.inc sql/item_func.cc: Simplify code (as signal_divide_by_null sets 'null_value')
-
unknown authored
into mysql.com:/home/my/mysql-5.0
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean sql/item_func.cc: Auto merged
-
unknown authored
into moonbone.local:/work/13855-bug-4.1-mysql
-
unknown authored
After merge fix mysql-test/r/select.result: After merge fix
-
unknown authored
include/config-netware.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/select.result: Manually merged fix for bug#13855 mysql-test/t/select.test: Manuall merged fix for bug#13855
-
unknown authored
into mysql.com:/home/alexi/dev/mysql-4.1-innobase
-
unknown authored
into selena.:H:/MYSQL/src/#13377-mysql-5.0a
-
unknown authored
Code that closes current relay log is moved to purge_relay_logs().
-
unknown authored
Dump MY_CS_CSSORT when it's necessary. strings/conf_to_src.c: Dump MY_CS_CSSORT when it's necessary.
-
unknown authored
into mysql.com:/home/my/mysql-5.0
-
unknown authored
Added back missing return in mysql_delete() mysql-test/my_manage.c: Cleanup: Remove some #ifdef mysql-test/r/drop_temp_table.result: Delete database that may be left from other test mysql-test/t/drop_temp_table.test: Delete database that may be left from other test sql/log.cc: false -> FALSE true -> TRUE Wait until readers_count is 0 (not just for a signal) NOTE: it's very likely that the way to handle readers_count is wrong. (We are in pthread_cond_wait freeing a mutex that is not the innermost mutex, which can lead to deadlocks) I will talk with Guilhem about this ASAP sql/log_event.h: Remove number from last even to help future merges (all compilers I know of can handle this properly) sql/sql_delete.cc: Add back missing RETURN (was lost in a merge) Indentation fixes
-
unknown authored
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
-
unknown authored
server-tools/instance-manager/listener.cc: reinitialize timer used in select(), as on linux it is modified to reflect amout of time not slept (e.g. set ot zero)
-
unknown authored
Updating to conform the current CHARSET_INFO structure. strings/conf_to_src.c: Updating to conform the current structure.
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1.b13347
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b14290
-
unknown authored
into mysql.com:/space/pekka/ndb/version/my50
-
unknown authored
ndb/test/src/HugoCalculator.cpp: does not use Base64.hpp which was renamed to base64.h
-
unknown authored
into mysql.com:/home/mydev/mysql-5.0-bug12166
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b14290
-