An error occurred fetching the project authors.
  1. 22 Jun, 2004 24 commits
  2. 21 Jun, 2004 16 commits
    • unknown's avatar
      Coding style fixes · 271eb258
      unknown authored
      271eb258
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4b5c2cfa
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-cleanup
      
      
      4b5c2cfa
    • unknown's avatar
      Small cleanup in time zone handling code: · 877ffa01
      unknown authored
      Now we are using time zone abbreviations in debug builds or in utlities only.
      Tried to remove warnings generated by compiler by using more proper types for
      members of time zone describing structures. Removed unused variables. 
      Fixed test_time to be able to build on FreeBSD without much problems.
      Portability fix: resolved ambiguity of abs() function.
      
      
      877ffa01
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 06c845ee
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-874
      
      
      06c845ee
    • unknown's avatar
      Including in enum_shutdown_level the 2 types of KILL of 5.0 · ce5b804e
      unknown authored
      (enum_shutdown_level is going to replace enum killed_state in 5.0).
      
      
      VC++Files/winmysqladmin/mysql_com.h:
        putting in place the 2 types of KILL of 5.0
      include/mysql_com.h:
        putting in place the two types of KILL of 5.0
      ce5b804e
    • unknown's avatar
      fixed picture in comment. · 47efa207
      unknown authored
      47efa207
    • unknown's avatar
      Unused variables removed (many files). · de628592
      unknown authored
      sql/item_func.cc:
        Unused variable 'thd' removed.
      sql/item_subselect.cc:
        Unused variable 'type' removed.
      sql/slave.cc:
        Unused variable 'return_val' removed.
      sql/sql_derived.cc:
        Unused variable 'is_subsel' removed.
      sql/sql_parse.cc:
        Unused variables 'pstr' and 'create_info' removed.
      sql/sql_prepare.cc:
        Unused variable 'res' removed.
      sql/time.cc:
        Unused variable 'str_begin' removed.
      de628592
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 6091a75f
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-874
      
      
      6091a75f
    • unknown's avatar
      changing order of enum_shutdown_level (easier; we can test if we should die with · 7ef30b69
      unknown authored
      "if (thd->killed > thd->killable)", if we simply do
      thd->killed= level;
      
      
      7ef30b69
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d2fb4c28
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.bnew
      
      
      d2fb4c28
    • unknown's avatar
      ndb file missing in src dist · f5f599b5
      unknown authored
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      f5f599b5
    • unknown's avatar
      a fix (bug #4198: Incorrect key file for table). · 7b1626ed
      unknown authored
      7b1626ed
    • unknown's avatar
      proper test of warnings for group_concat(). · e3b3720e
      unknown authored
      e3b3720e
    • unknown's avatar
      Field_geom should have same max_length as Field_blob · 19eb2ce4
      unknown authored
      Updated tests
      After merge fix
      
      
      mysql-test/r/func_time.result:
        Updated tests
      sql/field.cc:
        After merge fix
        Removed compiler warning
      sql/field.h:
        Field_geom should have same max_length as Field_blob
      19eb2ce4
    • unknown's avatar
      merge · 028dfdb3
      unknown authored
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      Build-tools/Do-compile:
        Auto merged
      include/my_global.h:
        Auto merged
      innobase/row/row0ins.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      innobase/fil/fil0fil.c:
        merge (Use heikki's code)
      028dfdb3
    • unknown's avatar
      After merge fixes · b5dfd056
      unknown authored
      Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
      
      
      client/mysqltest.c:
        Added MAX_VAR_NAME which was lost in merge
        Added more debugging
        Fixed bug in 'eval'
      innobase/data/data0type.c:
        After merge fix
      innobase/fil/fil0fil.c:
        After merge fix
      innobase/log/log0recv.c:
        After merge fix
      myisam/mi_unique.c:
        Better checksum handling
      mysql-test/r/func_time.result:
        Return NULL if a time argument is given to date_add()
      mysql-test/r/rpl_free_items.result:
        After merge fix
      mysql-test/r/rpl_get_lock.result:
        Test was depending on when server was restarted.
      mysql-test/r/type_date.result:
        After merge fix
      mysql-test/r/type_decimal.result:
        After merge fix
      mysql-test/t/func_time.test:
        Removed comment that is not needed anymore
        (After Dimitri's timezone patch is pushed, we should get a warning for the date_add(time...) entry)
      mysql-test/t/rpl_get_lock.test:
        Test was depending on when server was restarted.
      mysql-test/t/type_date.test:
        Addded missing explanation for bug
      netware/mysqld_safe.c:
        Removed end \r
        Run program through indent-ex to get MySQL indentation
      sql-common/client.c:
        After merge fix
      sql/field.cc:
        Fixed that get_date(time) gives a warning
      sql/field.h:
        After merge fix
      sql/net_serv.cc:
        More debugging (if DEBUG_DATA_PACKETS is set)
      sql/sql_class.cc:
        Removed compiler warning
      sql/table.cc:
        Better comment
      b5dfd056