1. 28 Oct, 2005 14 commits
  2. 27 Oct, 2005 26 commits
    • unknown's avatar
      Merge 4.1 - 5.0 · 1b574f5b
      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)
      1b574f5b
    • unknown's avatar
      fixe of typos, comments & layout · c1852b12
      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
      c1852b12
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 4a816ce1
      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
      4a816ce1
    • unknown's avatar
      support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787) · 24ac4019
      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
      24ac4019
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 · 7911c507
      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
      7911c507
    • unknown's avatar
      Add DROP TABLE before trying to create view (in mysqldump) · fd0ed478
      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')
      fd0ed478
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 84d072dc
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      84d072dc
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-14009 · 5e8515d9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/item_func.cc:
        Auto merged
      5e8515d9
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 987c33a9
      unknown authored
      into moonbone.local:/work/13855-bug-4.1-mysql
      
      
      987c33a9
    • unknown's avatar
      select.result: · fb94ffda
      unknown authored
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      fb94ffda
    • unknown's avatar
      Manually merged · 111b40e1
      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
      111b40e1
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · e28a02ec
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-4.1-innobase
      
      
      e28a02ec
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6196a746
      unknown authored
      into  selena.:H:/MYSQL/src/#13377-mysql-5.0a
      
      
      6196a746
    • unknown's avatar
      Fix for the patch #13377. Avoids race condition for relay logs close. · 84e2ab8c
      unknown authored
      Code that closes current relay log is moved to purge_relay_logs().
      
      
      84e2ab8c
    • unknown's avatar
      conf_to_src.c: · 4cccc642
      unknown authored
        Dump MY_CS_CSSORT when it's necessary.
      
      
      strings/conf_to_src.c:
        Dump MY_CS_CSSORT when it's necessary.
      4cccc642
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 854ad0ab
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      854ad0ab
    • unknown's avatar
      Fixes during review of pushed code · 2f2d0b60
      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
      2f2d0b60
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f0cf596a
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
      
      
      f0cf596a
    • unknown's avatar
      Fix for Bug #14388 "IM eats 99% CPU" · 4faf466b
      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)
      4faf466b
    • unknown's avatar
      conf_to_src.c: · fed8b208
      unknown authored
        Updating to conform the current CHARSET_INFO structure.
      
      
      strings/conf_to_src.c:
        Updating to conform the current structure.
      fed8b208
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6ec1c061
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b13347
      
      
      6ec1c061
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c58a2bf7
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b14290
      
      
      c58a2bf7
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9b069aa3
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50
      
      
      9b069aa3
    • unknown's avatar
      ndb - base64 compile fix in ndbapi test · 63dcf8b3
      unknown authored
      
      ndb/test/src/HugoCalculator.cpp:
        does not use Base64.hpp which was renamed to base64.h
      63dcf8b3
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 9ed55a33
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug12166
      
      
      9ed55a33
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · ae47b50c
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b14290
      
      
      ae47b50c