1. 15 May, 2004 1 commit
  2. 07 May, 2004 4 commits
    • unknown's avatar
      Added additional parameter userdata for mysql_set_local_infile_handler · c6bc3cfb
      unknown authored
      to allow binding of userland functions in PHP.
      
      
      include/mysql.h:
        added new last parameter (void *) for mysql_set_local_infile_handler
        st_mysql_options:
          added void *local_infile_userdata
          added last parameter (void *) for local_infile_init function pointer
      libmysql/libmysql.c:
        added parameter userdata in mysql_set_local_infile_handler
        added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init
        passed additional parameter userdata to init function in handle_local_infile
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      c6bc3cfb
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · c207325a
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-wl1687
      
      
      sql/handler.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      c207325a
    • unknown's avatar
      ctype-win1250ch.c, ctype-czech.c: · e3211fbd
      unknown authored
        Czech collations were renamed to _cs
      Index.xml:
        Czech collation were renamed to _cs
      
      
      sql/share/charsets/Index.xml:
        Czech collation were renamed to _cs
      strings/ctype-czech.c:
        Czech collations were renamed to _cs
      strings/ctype-win1250ch.c:
        Czech collations were renamed to _cs
      e3211fbd
    • unknown's avatar
      Portablity fix for system with case insenstive table names. (Without this... · dedea9b6
      unknown authored
      Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB)
      
      
      
      dedea9b6
  3. 06 May, 2004 22 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 33e6b2af
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      libmysql/libmysql.c:
        Auto merged
      33e6b2af
    • unknown's avatar
      Portability fixes · f3544f3c
      unknown authored
      Change strtoll -> my_strtoll10()
      Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
      
      
      configure.in:
        Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE
      extra/my_print_defaults.c:
        Fixed wrong definition for 'verbose'
      include/my_global.h:
        Portability fix (IRIX64)
      libmysql/client_settings.h:
        Remove compiler warnings
      libmysql/libmysql.c:
        Remove compiler warnings
      mysql-test/r/func_str.result:
        Updated results
      mysql-test/r/key_cache.result:
        Updated results to not depend on key_blocks_unused
      mysql-test/t/func_str.test:
        More test of long overflow
      mysql-test/t/key_cache.test:
        Updated results to not depend on key_blocks_unused
      sql/item.cc:
        Portability fix (don't use strtoll())
      sql/item.h:
        Portability fix (don't use strtoll())
      sql/item_sum.h:
        Portability fix (don't use strtoll())
      sql/item_timefunc.cc:
        Fixed compiler warning
      strings/ctype-simple.c:
        Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
      strings/ctype-ucs2.c:
        Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
      f3544f3c
    • unknown's avatar
      Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 · a6bd0b3c
      unknown authored
      into hegel.local:/home/miguel/bk/mysql-4.1
      
      
      a6bd0b3c
    • unknown's avatar
      Windows VC++ compiler compatibility · 71d02f6d
      unknown authored
      
      sql/set_var.cc:
        VC++ error compiler compatibility
      71d02f6d
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · b1657c8d
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
      
      
      b1657c8d
    • unknown's avatar
      postreview fixes · cd328cc2
      unknown authored
      
      sql/sql_lex.h:
        description of field
      sql/sql_union.cc:
        layout fixed
      cd328cc2
    • unknown's avatar
      fake_select_lex should be prepared during PS preparation to work correctly · 56568288
      unknown authored
      item_list for fake_select will be created only once
      (problem reported by valgrind in test_union2 fixed)
      
      
      sql/sql_lex.h:
        new function to keep code in one place
      sql/sql_union.cc:
        fake_select_lex should be prepared during PS preparation to work correctly
        item_list for fake_select will be created only once
      56568288
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 2ad8fc47
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      2ad8fc47
    • unknown's avatar
      - removed duplicate file ..\strings\strxnmov.c from the mysqlclient.dsp · 1972bca3
      unknown authored
         that was accidently added by the last BK auto merge
      
      
      VC++Files/client/mysqlclient.dsp:
         - removed duplicate file ..\strings\strxnmov.c that was added by the
           last auto merge
      1972bca3
    • unknown's avatar
      mysql_stmt_reset now expects ok/error packet from server. · 151495ba
      unknown authored
      
      libmysql/libmysql.c:
        Make advanced_command check client reply
      sql/sql_prepare.cc:
        mysql_stmt_reset now sends ok/error reply to the client.
      tests/client_test.c:
        Memory leak fixed.
      151495ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ffdf46a5
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      
      ffdf46a5
    • unknown's avatar
      Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms. · 52656969
      unknown authored
      
      sql/handler.h:
        Fixed (portability) bug. No qualified method names in the class definition.
      sql/item_cmpfunc.h:
        Attempt to silence cast warnings on some platforms.
      sql/item_subselect.h:
        Attempt to silence cast warnings on some platforms.
      sql/set_var.cc:
        Silence warning (missing cast).
      sql/spatial.h:
        Attempt to silence cast warnings on some platforms.
      sql/sql_cache.cc:
        Silence warning (wrong cast).
      sql/sql_lex.h:
        Attempt to silence cast warnings on some platforms.
      52656969
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 96ae3b4d
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      96ae3b4d
    • unknown's avatar
      - Windows compile fixes: added some missing files to the Windows Project · bd43223e
      unknown authored
         files, fixed linking of myisam_ftdump
      
      
      VC++Files/client/mysqlclient.dsp:
         - added strings/ctype.uca.c
      VC++Files/libmysql/libmysql.dsp:
         - added strings/ctype.uca.c
      VC++Files/myisam_ftdump/myisam_ftdump.dsp:
         - added zlib to the link line
      VC++Files/sql/mysqld.dsp:
         - added discover.cpp
      VC++Files/strings/strings.dsp:
         - added strings/ctype.uca.c
      bd43223e
    • unknown's avatar
      Windows VC++ compability fix · ec23080b
      unknown authored
      
      sql/set_var.cc:
        Fix VC++ compiler error
      ec23080b
    • unknown's avatar
      WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again). · bfe2425a
      unknown authored
      HEAP: Copies the key count to a backup variable and sets the key count to zero.
      That way, no HEAP function will ever try to touch any index.
      Re-enabling is done by copying back the backup variable.
      To avoid memory leak at table close, disable deletes all index trees.
      Re-enabling must be done with empty indexes and data anyway. Otherwise,
      the indexes would need to be repaired, wich HEAP is not capable of.
      MyISAM: Only the key_map is cleared and set.
      Re-enabling must be done with empty indexes and data. Otherwise, repair needs
      to be done which will enable all keys persistently.
      The former implementation disabled only non-unique keys and maked this persistent.
      The new implementation additionally can disable all keys, but only without
      making this persistent. Re-enabling all keys can be done without repair,
      if data file and indexes are empty.
      
      
      heap/heapdef.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Pulled hp_clear_keys() out of hp_clear().
      heap/hp_clear.c:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Pulled hp_clear_keys() out of hp_clear().
        Added the new functions for disabling and enabling keys and to ask for the key state.
      include/heap.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added a new HP_SHARE element to save the key count while keys are disabled.
        Added declarations for the new functions.
      myisam/mi_open.c:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added the new functions for disabling and enabling keys and to ask for the key state.
      myisam/myisamdef.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added declarations for the new functions.
      sql/ha_heap.cc:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Pulled set_keys_for_scanning() out of open().
        Added the new functions for disabling and enabling keys and to ask for the key state.
      sql/ha_heap.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added declarations for the new functions.
      sql/ha_myisam.cc:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Extended disable_indexes() for all keys and no save.
        The argument is now 'mode' as it must handle different cases.
        Extended enable_indexes() for no save.
        The new feature needs the new argument 'mode' with the same semantics as in disable_indexes().
        Added indexes_are_disabled() to ask for the key state.
        Extended the existing call to enable_indexes() by the new argument.
      sql/ha_myisam.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Modified the declarations of dis-/enable_indexes() for the new argument.
        Added the declaration of the new function to ask for the key state.
      sql/handler.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added declarations for the operation modes for the key switching functions.
        Modified the declarations of dis-/enable_indexes() for the new argument.
        Added the declaration of the new function to ask for the key state.
      sql/sql_select.cc:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        In create_myisam_from_heap() take notice of disabled keys
        and disable them in the new table before copying the data.
      sql/sql_table.cc:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Modified the calls of dis-/enable_indexes() for the new argument.
      bfe2425a
    • unknown's avatar
      Merge with 4.0 to get security patch for check_grant_colum · 445148f0
      unknown authored
      
      innobase/include/os0file.h:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      mysql-test/r/rpl_server_id2.result:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/slave.cc:
        Merge with 4.0
      445148f0
    • unknown's avatar
      Few cleanups to client_test.c · f088cf99
      unknown authored
      
      tests/client_test.c:
        Few cleanups
      f088cf99
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 · 2d776e36
      unknown authored
      
      sql/sql_acl.cc:
        Auto merged
      2d776e36
    • unknown's avatar
      Remove not used variable · 33359d0b
      unknown authored
      33359d0b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cc7a8d9b
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      cc7a8d9b
    • unknown's avatar
      Fixed wrong key usage which caused wrong result for some "WHERE... · d91477ce
      unknown authored
      Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
      The bug was introduced in a patch in the 4.1.2 source tree.
      
      
      mysql-test/r/key.result:
        New result
      mysql-test/t/key.test:
        Added test case for bug in key read
      sql/sql_select.cc:
        Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
      d91477ce
  4. 05 May, 2004 13 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · cd57fc8b
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      cd57fc8b
    • unknown's avatar
      fixed test results · 1f32e9a1
      unknown authored
      1f32e9a1
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 66842d6e
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
      
      
      66842d6e
    • unknown's avatar
      Replication: · 974ce66b
      unknown authored
      as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
      
      
      mysql-test/r/rpl_server_id2.result:
        result update
      sql/slave.cc:
        As the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
      974ce66b
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · bfa22229
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      bfa22229
    • unknown's avatar
      very minor changes: a STOP SLAVE in a replication test to get rid of a non... · 601bdde5
      unknown authored
      very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
      and a comment update
      
      
      mysql-test/r/rpl_server_id2.result:
        result update
      mysql-test/t/rpl_server_id2.test:
        We stop the slave before cleaning up otherwise we'll get
        'drop table t1' executed twice, so an error in the slave.err
        (not critical).
      sql/slave.cc:
        update comment about 4.1 now that 4.1 is fixed (in a few minutes, exactly)
      601bdde5
    • unknown's avatar
      merge · b52317df
      unknown authored
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      b52317df
    • unknown's avatar
      After merge fixes · 19d3f588
      unknown authored
      19d3f588
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e5d43578
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      e5d43578
    • unknown's avatar
      after merge fixes · 000f76cf
      unknown authored
      
      client/mysqldump.c:
        Fixed problem with multiple tables (--skip-quote didn't work properly for second table)
      myisam/myisamchk.c:
        after merge fix
      000f76cf
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 2c95f97c
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
      
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      2c95f97c
    • unknown's avatar
      caching of queries with isammerge tables forbiden using general way · f6428e8b
      unknown authored
      SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
      correct table list passed to class constructor of select_update
      
      
      mysql-test/r/subselect.result:
        do not show limit if it is not explicit
      mysql-test/r/union.result:
        test of LIMIT + ORDER
      mysql-test/t/union.test:
        test of LIMIT + ORDER
      sql/ha_isammrg.h:
        caching of queries with isammerge tables forbiden
      sql/sql_cache.cc:
        removed check on isammerge
      sql/sql_lex.cc:
        tag of explicit limit in statement
      sql/sql_lex.h:
        tag of explicit limit in statement
      sql/sql_parse.cc:
        blanks in empty line removed
        no limit by default (SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause)
      sql/sql_union.cc:
        reverted incorrect patch
      sql/sql_update.cc:
        reverted incorrect patch
        correct table list passed to class constructor
      sql/sql_yacc.yy:
        explicit LIMIT marked
      f6428e8b
    • unknown's avatar
      Make Item_param::val_int and Item_param::val_str follow the used convention... · e1fc5423
      unknown authored
      Make Item_param::val_int and Item_param::val_str follow the used convention and return 0 if null_value==1.
      
      
      sql/item.h:
        Added comments about Item::valxx() behavior if Item's value is NULL.
      e1fc5423