1. 11 Jun, 2003 5 commits
    • unknown's avatar
      ft_update.c: · 129cb8e9
      unknown authored
        Fix parse error per serg instructions.
      
      
      myisam/ft_update.c:
        Fix parse error per serg instructions.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      129cb8e9
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 5693a272
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      5693a272
    • unknown's avatar
      test result updated · 41021a0f
      unknown authored
      
      mysql-test/t/rpl_relayrotate.test:
        when mysqld has no innodb compiled in it's not a bug!
      41021a0f
    • unknown's avatar
      We now require SUPER privilege for SET PSEUDO_THREAD_ID. · b7e0c11a
      unknown authored
      
      mysql-test/r/rpl_temporary.result:
        result update
      mysql-test/t/rpl_temporary.test:
        test that PSEUDO_THREAD_ID now requires SUPER.
      sql/set_var.cc:
        Class for pseudo_thread_id (it used to be sys_var_thd_ulong, but we 
        decided to require the SUPER privilege so we needed a check() function,
        which sys_var_thd_ulong does not feature (check() is virtual in sys_var
        and in sys_var_thd_ulong too).
      sql/set_var.h:
        Class for pseudo_thread_id
      b7e0c11a
    • unknown's avatar
      3a4be004
  2. 10 Jun, 2003 13 commits
  3. 09 Jun, 2003 3 commits
  4. 08 Jun, 2003 1 commit
    • unknown's avatar
      Fix for mysql_list_fields & reset stmt buffers from stmt_free_result · 0bb5b9ea
      unknown authored
        Windows build fix 
      
      
      VC++Files/sql/mysqld.dsp:
        Added sql_state.c to wrk space
      include/mysql_com.h:
        Windows build fix (mismatch declaration of my_bool and bool from defination)
      include/thr_alarm.h:
        Windows build fix
      libmysql/libmysql.c:
        Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
      tests/client_test.c:
        Updated test for DEFAULT value for mysql_list_fields()
        New tests for mysql_stmt_free_result()
      0bb5b9ea
  5. 06 Jun, 2003 4 commits
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7fac151b
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      7fac151b
    • unknown's avatar
      REVOKE all privileges and delete user(244) · d1a1d24c
      unknown authored
      
      include/mysqld_error.h:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      mysql-test/r/grant.result:
        Test for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      mysql-test/t/grant.test:
        Test for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/czech/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/danish/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/dutch/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/english/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/estonian/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/french/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/german/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/greek/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/hungarian/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/italian/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/japanese/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/korean/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/norwegian-ny/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/norwegian/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/polish/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/portuguese/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/romanian/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/russian/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/serbian/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/slovak/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/spanish/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/swedish/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      sql/share/ukrainian/errmsg.txt:
        Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
      d1a1d24c
    • unknown's avatar
      client.c: · ac366a4b
      unknown authored
        Compilation falure fix
      
      
      sql-common/client.c:
        Compilation falure fix
      ac366a4b
    • unknown's avatar
      my_global.h: · 3177fb55
      unknown authored
        ulong was used before the line it have been declared
      
      
      include/my_global.h:
        ulong was used before the line it have been declared
      3177fb55
  6. 05 Jun, 2003 14 commits
    • unknown's avatar
      After merge fixes · 824dd7f5
      unknown authored
      
      mysql-test/r/repair_part1.result:
        Rename: mysql-test/r/repair.result -> mysql-test/r/repair_part1.result
      mysql-test/t/repair_part1.test:
        Rename: mysql-test/t/repair.test -> mysql-test/t/repair_part1.test
      include/sql_common.h:
        Declare not_error_sqlstate
      scripts/Makefile.am:
        Added back fill_help_tables.sql
      824dd7f5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cc66b447
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      cc66b447
    • unknown's avatar
      fixed bug (writting outside mallocced buffer in sql_help.cc) · d9a6a9ac
      unknown authored
      
      sql/sql_help.cc:
        fixed bug (writting outside mallocced buffer)
      d9a6a9ac
    • unknown's avatar
      Merge with 4.0.13 · 64d11bb3
      unknown authored
      
      BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/rpl_loaddata.result:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      64d11bb3
    • unknown's avatar
      Added function comment · a3afb2bc
      unknown authored
      a3afb2bc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · a86c80e4
      unknown authored
      into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
      
      
      a86c80e4
    • unknown's avatar
      mysqld won't give a warning any more, if --user=user_name is used, · 35cd3cba
      unknown authored
      if 'user_name' is the current user and it is not root.
      
      
      35cd3cba
    • unknown's avatar
      ha_innodb.cc: · d3d86c12
      unknown authored
        Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree
      
      
      sql/ha_innodb.cc:
        Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree
      d3d86c12
    • unknown's avatar
      ha_innodb.cc, handler.cc: · 6d4ed167
      unknown authored
        Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB
      
      
      sql/handler.cc:
        Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB
      sql/ha_innodb.cc:
        Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB
      6d4ed167
    • unknown's avatar
      Merged fix for alarm on big blocks · d6f2e8c1
      unknown authored
      d6f2e8c1
    • unknown's avatar
      Fixed test if thr_alarm() failed · 4916da25
      unknown authored
      4916da25
    • unknown's avatar
      Merge jani@192.168.0.2:/my/mysql-4.0 · fb286d8b
      unknown authored
      into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
      
      
      fb286d8b
    • unknown's avatar
      Fixed a bug in concat_ws(), which did not add concat separator · 5bc53e8a
      unknown authored
      in case of an empty string. Bug ID 586.
      
      
      5bc53e8a
    • unknown's avatar
      Print error if we can't delete an alarm · cd714847
      unknown authored
      More debugging variables
      Increment aborted_threads in case of killed or too big packet
      
      
      include/thr_alarm.h:
        made prototype more portable
      mysys/thr_alarm.c:
        Print error if we can't delete an alarm
      sql/mysqld.cc:
        Statistics variable (for debugging)
      sql/net_serv.cc:
        statistics variable (for debugging)
      sql/sql_parse.cc:
        Increment aborted_threads in case of killed or too big packet
      cd714847