1. 13 Nov, 2004 1 commit
  2. 12 Nov, 2004 39 commits
    • unknown's avatar
      Needed for WL# 2094, MySQL Federated Storage Handler · 02840d1b
      unknown authored
      sql_string.h:
        simple string method to drop last character of a string (also decrements str_length)
      
      
      sql/sql_string.h:
        simple string method to drop last character of a string (also decrements str_length)
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      02840d1b
    • unknown's avatar
      Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 · 10a15f6b
      unknown authored
      into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
      
      
      10a15f6b
    • unknown's avatar
      Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0 · ae39bbf7
      unknown authored
      into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-4.1
      
      
      Docs/Makefile.am:
        Auto merged
      ae39bbf7
    • unknown's avatar
      Makefile.am: · 0f3b604d
      unknown authored
        Add -acc flag for texi2html to handle accented characters.
      
      
      Docs/Makefile.am:
        Add -acc flag for texi2html to handle accented characters.
      0f3b604d
    • unknown's avatar
      f5d7b7aa
    • unknown's avatar
      Merge with 4.1 to get latest fix to client_test.c · 6786c93b
      unknown authored
      
      mysql-test/r/func_str.result:
        Merge with 4.1
      mysys/default.c:
        Merge with 4.1
      sql/item_strfunc.cc:
        Merge with 4.1
      tests/client_test.c:
        Merge with 4.1
      6786c93b
    • unknown's avatar
      Portability fix for gcc 2.95.3 · 7c6738fb
      unknown authored
      After merge fixes
      
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        After merge fixes
      mysys/default.c:
        After merge fixes
      sql/mysql_priv.h:
        Portability fix for gcc 2.95.3
      sql/sql_base.cc:
        Portability fix for gcc 2.95.3
      7c6738fb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f0dd2d24
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      f0dd2d24
    • unknown's avatar
      Fixed a function call. · c77cb0a3
      unknown authored
      c77cb0a3
    • unknown's avatar
      Merge with 4.0 · 75a4c71b
      unknown authored
      75a4c71b
    • unknown's avatar
      Merge with 4.1 · 19c2ce47
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-Makefile.am:
        Auto merged
      BitKeeper/deleted/.del-Makefile.am~1:
        Delete: Docs/Images/Makefile.am
      client/mysqltest.c:
        Auto merged
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/serbian/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      configure.in:
        Merge with 4.0
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Merge with 4.0
      mysys/default.c:
        Merge with 4.1 (to get new extension handling)
      sql/log.cc:
        Merge with 4.0
      tests/client_test.c:
        Merge with 4.1 (to get possibility to run any tests)
      19c2ce47
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 20d88eb7
      unknown authored
      into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
      
      
      20d88eb7
    • unknown's avatar
      Code cleanup and some optimizations. · d605d887
      unknown authored
      d605d887
    • unknown's avatar
      Removed an unneccessary for() and variable. · c7b66f9d
      unknown authored
      c7b66f9d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 671871d9
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      671871d9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 870b048b
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      870b048b
    • unknown's avatar
    • unknown's avatar
      Fix to allow usage of 4.0 tables with 4.1 · 7dad3985
      unknown authored
      7dad3985
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34d46e6b
      unknown authored
      into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
      
      
      tests/client_test.c:
        Auto merged
      34d46e6b
    • unknown's avatar
      Added possibility to run only certain tests by giving the test name(s) · a046b88e
      unknown authored
      as argument(s) after options.
      
      Added option -T to display all current test names.
      
      
      a046b88e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · e3db4389
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      e3db4389
    • unknown's avatar
      Merge on pull · 4e561d74
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      4e561d74
    • unknown's avatar
      After merge fixes · 55ae2e78
      unknown authored
      
      client/mysqldump.c:
        Merge with 4.0 (and reordering of options)
      client/mysqltest.c:
        Added DB as a user variable
      myisam/mi_check.c:
        Trivial cleanup
      mysql-test/r/grant.result:
        Move test to be in same order as in 4.0
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Updated results
      mysql-test/r/ps_1general.result:
        Updated tests to work after privilege fixes
      mysql-test/r/timezone3.result:
        Updated results to 4.1
      mysql-test/t/ps_1general.test:
        Updated tests to work after privilege fixes
      sql-common/my_time.c:
        Applied sub-second patch from 4.0
      sql/sql_acl.cc:
        More debugging
      55ae2e78
    • unknown's avatar
      typos in error messages fixed · 2c6a3b97
      unknown authored
      
      sql/share/french/errmsg.txt:
        typos fixed
      sql/share/greek/errmsg.txt:
        typos fixed
      sql/share/portuguese/errmsg.txt:
        typos fixed
      sql/share/romanian/errmsg.txt:
        typos fixed
      sql/share/serbian/errmsg.txt:
        typos fixed
      sql/share/spanish/errmsg.txt:
        typos fixed
      sql/share/swedish/errmsg.txt:
        typos fixed
      2c6a3b97
    • unknown's avatar
      fill_help_tables.sh: · 5cc4a6e9
      unknown authored
        Recognize another Texinfo tag.
      
      
      scripts/fill_help_tables.sh:
        Recognize another Texinfo tag.
      5cc4a6e9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · aca57a3d
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-bg5890
      
      
      sql/sql_delete.cc:
        Auto merged
      aca57a3d
    • unknown's avatar
      Fix for bug #5890 "Triggers fail for DELETE without WHERE". · bb43e831
      unknown authored
      If we have DELETE with always true WHERE clause we should not use 
      optimized delete_all_rows() method for tables with DELETE triggers,
      because in this case we will lose side-effect of deletion.
      
      
      mysql-test/r/trigger.result:
        Added test for bug #5890 "Triggers fail for DELETE without WHERE".
      mysql-test/t/trigger.test:
        Added test for bug #5890 "Triggers fail for DELETE without WHERE".
      sql/sql_delete.cc:
        mysql_delete(): 
          We should not use optimized delete_all_rows() method for tables
          with DELETE triggers, because in this case we will lose side-effect
          of deletion.
      sql/sql_trigger.h:
        Added new Table_triggers_list::has_delete_triggers() method which
        allows to understand quickly if we have some DELETE triggers in
        our list.
      bb43e831
    • unknown's avatar
      mysqldump.c: · c1400a84
      unknown authored
        Add missing sentinel.
      
      
      client/mysqldump.c:
        Add missing sentinel.
      c1400a84
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f9027374
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      f9027374
    • unknown's avatar
    • unknown's avatar
      Fixed merge bug(?) in mysqldump.c. · 980a4188
      unknown authored
      
      client/mysqldump.c:
        Added missing sentinel.
      980a4188
    • unknown's avatar
      Various build fixes. · eed282d6
      unknown authored
      
      sql/mysql_priv.h:
        Fix build problems (causing link errors with the Sun compiler).
      sql/net_serv.cc:
        Corrected macro definition.
      sql/sql_base.cc:
        Fixed build problems (for broken HP compiler).
      sql/sql_show.cc:
        64-bit build fix.
      eed282d6
    • unknown's avatar
      Build fixes to make it compile. · c3531618
      unknown authored
      
      sql/handler.cc:
        Build fixes.
      sql/log_event.cc:
        Build fixes.
      c3531618
    • unknown's avatar
      merge with 4.0 · 44070705
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-Makefile.am:
        Delete: Docs/Images/Makefile.am
      Build-tools/Bootstrap:
        Auto merged
      Docs/Makefile.am:
        Auto merged
      configure.in:
        Auto merged
      include/mysql.h:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysys/default.c:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/log.cc:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      client/mysqldump.c:
        merge with 4.0
        (This only reorders options)
      sql/ha_innodb.cc:
        merge with 4.0 (Keep original code)
      sql/time.cc:
        Note that part of this patch is done in my_time.c
      44070705
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 · 5cc756f6
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
      
      
      5cc756f6
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4374aaa5
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6551
      
      
      4374aaa5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6a1bc4a5
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      6a1bc4a5
    • unknown's avatar
      Merge avenger.(none):/export/brian/mysql/test/4.1 · 0265f48b
      unknown authored
      into avenger.(none):/export/brian/mysql/test/5.0
      
      
      client/mysqldump.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      0265f48b
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 04519f43
      unknown authored
      into avenger.(none):/export/brian/mysql/test/5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      04519f43