1. 10 Sep, 2003 6 commits
  2. 09 Sep, 2003 4 commits
    • unknown's avatar
      after merge fix · 886f29fc
      unknown authored
      886f29fc
    • unknown's avatar
      merge · 5dd1379f
      unknown authored
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/item.cc:
        Auto merged
      5dd1379f
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 83794e3f
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      83794e3f
    • unknown's avatar
      Fix for a bug #1226. · 6bc438e3
      unknown authored
      Happens when braces are used on a single select, which leads
      to the uninitialized global parameters structure.
      
      6bc438e3
  3. 08 Sep, 2003 11 commits
  4. 07 Sep, 2003 2 commits
  5. 06 Sep, 2003 3 commits
  6. 04 Sep, 2003 3 commits
    • unknown's avatar
      Fix for bug 1176 · 34625c18
      unknown authored
      34625c18
    • unknown's avatar
      BUG · 30535c58
      unknown authored
      correct bug 1085 (a problem with min/max functions)
      add tests of bugs 833,836,1085
      
      
      mysql-test/r/func_gconcat.result:
        add tests of bugs 833, 836, 1085
      mysql-test/t/func_gconcat.test:
        add tests of bugs #833, 836, 1085
      sql/item_sum.cc:
        merge
      sql/item_sum.h:
        correct bug 1085
      30535c58
    • unknown's avatar
      merge · a5650c0b
      unknown authored
      a5650c0b
  7. 03 Sep, 2003 11 commits
    • unknown's avatar
      fixed bug - check_user shall not be included into the · 43a8991f
      unknown authored
      embedded library.
      
      43a8991f
    • unknown's avatar
      Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · be773ae8
      unknown authored
      into oak.local:/home/kostja/mysql/mysql-4.1-root
      
      be773ae8
    • unknown's avatar
      C cleanups · 12f7ffbb
      unknown authored
      12f7ffbb
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · df23d18e
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      df23d18e
    • unknown's avatar
      fixed after-merge bug in CHANG_USER command · 3143ac78
      unknown authored
      
      sql/sql_parse.cc:
        fixed after-merge bug in CHANGE_USER command
      3143ac78
    • unknown's avatar
      Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 48e6347a
      unknown authored
      into oak.local:/home/kostja/mysql/mysql-4.1-root
      
      
      BitKeeper/etc/ignore:
        auto-union
      48e6347a
    • unknown's avatar
      post-merge fixes · d45953fa
      unknown authored
      
      mysql-test/r/func_crypt.result:
        _dig_vec converted lowercase
      sql/slave.cc:
        post-merge fix
      d45953fa
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 89817531
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
      
      89817531
    • unknown's avatar
      merge commit, hope that none of bar and dlenev changes were · 5b4fdded
      unknown authored
      lost.
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      include/mysqld_error.h:
        merge commit: new error message added
      sql-common/client.c:
        merge commit
      sql/mysql_priv.h:
        merge commit: autoremerge
      sql/set_var.h:
        merge commit
      sql/share/czech/errmsg.txt:
        merge commit
      sql/share/danish/errmsg.txt:
        merge commit
      sql/share/dutch/errmsg.txt:
        merge commit
      sql/share/english/errmsg.txt:
        merge commit
      sql/share/estonian/errmsg.txt:
        merge commit
      sql/share/french/errmsg.txt:
        merge commit
      sql/share/german/errmsg.txt:
        merge commit
      sql/share/greek/errmsg.txt:
        merge commit
      sql/share/hungarian/errmsg.txt:
        merge commit
      sql/share/italian/errmsg.txt:
        merge commit
      sql/share/japanese/errmsg.txt:
        merge commit
      sql/share/korean/errmsg.txt:
        merge commit
      sql/share/norwegian-ny/errmsg.txt:
        merge commit
      sql/share/norwegian/errmsg.txt:
        merge commit
      sql/share/polish/errmsg.txt:
        merge commit
      sql/share/portuguese/errmsg.txt:
        merge commit
      sql/share/romanian/errmsg.txt:
        merge commit
      sql/share/russian/errmsg.txt:
        merge commit
      sql/share/serbian/errmsg.txt:
        merge commit
      sql/share/slovak/errmsg.txt:
        merge commit
      sql/share/spanish/errmsg.txt:
        merge commit
      sql/share/swedish/errmsg.txt:
        merge commit
      sql/share/ukrainian/errmsg.txt:
        merge commit
      sql/slave.cc:
        merge commit
      sql/slave.h:
        merge commit
      sql/sql_acl.cc:
        merge commit
      sql/sql_parse.cc:
        merge commit
      sql/sql_repl.h:
        merge commit
      5b4fdded
    • unknown's avatar
      merged · 3350532e
      unknown authored
      
      include/my_sys.h:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      3350532e