1. 11 May, 2004 11 commits
  2. 10 May, 2004 15 commits
  3. 07 May, 2004 6 commits
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · 1f0e4f40
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      sql/sql_table.cc:
        Auto merged
      1f0e4f40
    • unknown's avatar
      Added additional parameter userdata for mysql_set_local_infile_handler · fabcf369
      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
      fabcf369
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · 88065f5c
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      sql/sql_table.cc:
        Auto merged
      88065f5c
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 0a86a110
      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
      0a86a110
    • unknown's avatar
      ctype-win1250ch.c, ctype-czech.c: · 0c639204
      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
      0c639204
    • unknown's avatar
      Portablity fix for system with case insenstive table names. (Without this... · 340b6c58
      unknown authored
      Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB)
      
      
      340b6c58
  4. 06 May, 2004 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c62c4497
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      libmysql/libmysql.c:
        Auto merged
      c62c4497
    • unknown's avatar
      Portability fixes · f3b3b2b1
      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
      f3b3b2b1
    • unknown's avatar
      Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 · eac9345a
      unknown authored
      into hegel.local:/home/miguel/bk/mysql-4.1
      
      eac9345a
    • unknown's avatar
      Windows VC++ compiler compatibility · d4589044
      unknown authored
      
      sql/set_var.cc:
        VC++ error compiler compatibility
      d4589044
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 51339f30
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
      
      51339f30
    • unknown's avatar
      postreview fixes · 9074fb2d
      unknown authored
      
      sql/sql_lex.h:
        description of field
      sql/sql_union.cc:
        layout fixed
      9074fb2d
    • unknown's avatar
      fake_select_lex should be prepared during PS preparation to work correctly · 1e17fb37
      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
      1e17fb37
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · cd7b3ca6
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      cd7b3ca6