1. 10 Feb, 2005 16 commits
    • unknown's avatar
      Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src · 9fe4e2a4
      unknown authored
      into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
      
      
      9fe4e2a4
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0 · 6520c161
      unknown authored
      into mysql.com:/home/bk/b7853-mysql-5.0
      
      
      client/mysqlbinlog.cc:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      6520c161
    • unknown's avatar
      Merge mysql.com:/home/kostja/work/mysql-4.1-root · 6cdda5b3
      unknown authored
      into mysql.com:/home/kostja/work/mysql-5.0-root
      
      
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      6cdda5b3
    • unknown's avatar
      Follow-up for bug#7990 · d9039e87
      unknown authored
      
      libmysql/libmysql.c:
        And now put it to the proper place and make it work (Bug#7990)
      tests/mysql_client_test.c:
        Enable the test for bug#7990
      d9039e87
    • unknown's avatar
      Merge mysql.com:/home/kostja/work/mysql-4.1-root · 98bc2348
      unknown authored
      into mysql.com:/home/kostja/work/mysql-5.0-root
      
      
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      98bc2348
    • unknown's avatar
      Fix -ansi -pedantic compilation failure. · bebba958
      unknown authored
      bebba958
    • unknown's avatar
      A fix and test case for Bug#7990 "mysql_stmt_close doesn't · a26ce94f
      unknown authored
      reset mysql->net.last_error": the solution is to clear
      MYSQL->net error before performing COM_CLOSE: if the call
      succeeds, the connection is usable for other statements.
      More comprehensive fix is to clear MYSQL->net for all
      recoverable errors at the time they happen, it will be
      implemented in 5.0 as it introduces incompatibility in behavior.
      
      
      libmysql/libmysql.c:
        A simple fix for Bug#7990 "mysql_stmt_close doesn't reset 
        mysql->net.last_error"
      tests/mysql_client_test.c:
        A test case for Bug#7990 " mysql_stmt_close doesn't reset 
        mysql->net.last_error"
      a26ce94f
    • unknown's avatar
      manual merge · c7674f14
      unknown authored
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      c7674f14
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 77b2435e
      unknown authored
      into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      77b2435e
    • unknown's avatar
      Things missing in last changset · 4adab48b
      unknown authored
      After merge fixes
      Don't give duplicate warnings for some ::store() functions
      
      
      mysql-test/mysql-test-run.sh:
        Added back missing line
      mysql-test/r/ps_2myisam.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_3innodb.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_4heap.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_5merge.result:
        Update results after removing duplicate warnings from ::store()
      sql/field.cc:
        Don't give duplicate warnings for some ::store() functions
        Before we could get different number of warnings in the test suite for different platforms
      sql/field.h:
        Update results after removing duplicate warnings from ::store()
      sql/sql_class.h:
        Update results after removing duplicate warnings from ::store()
      sql/sql_error.cc:
        Update results after removing duplicate warnings from ::store()
      sql/sql_list.h:
        After merge fix
      4adab48b
    • unknown's avatar
      Change script to avoiud multiple --debug flags when starting master servers · 6e021edc
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Use local var for the individulisation of tracefile name
      6e021edc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d435c8a
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      2d435c8a
    • unknown's avatar
      A fix and test case for Bug#8330 "mysql_stmt_execute crashes" (libmysql). · fca90750
      unknown authored
      
      libmysql/libmysql.c:
        Fix for bug#8330 "mysql_stmt_execute crashes": we need to bail out
        from mysql_stmt_execute if mysql->net is occupied with a result set of
        another statement. Otherwise on the next attempt to use net we get
        a crash, as it's freed in case of error.
      tests/mysql_client_test.c:
        A test case for Bug#8330 "mysql_stmt_execute craches" (libmysql)
      fca90750
    • unknown's avatar
      Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc. · 7684e100
      unknown authored
      
      sql/sql_parse.cc:
        Added missing #ifdef HAVE_INNOBASE_DB:s.
      7684e100
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-zlib · 425f2f91
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      425f2f91
    • unknown's avatar
      Merge with 4.1 · 9f04f9d0
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysqltest.c:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      extra/perror.c:
        Auto merged
      extra/resolve_stack_dump.c:
        Auto merged
      include/help_end.h:
        Auto merged
      include/help_start.h:
        Auto merged
      myisam/myisamlog.c:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/heap_hash.result:
        Auto merged
      BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      ndb/src/kernel/vm/FastScheduler.cpp:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      netware/BUILD/nwbootstrap:
        merge: keep local
      scripts/make_binary_distribution.sh:
        merge: keep local
      sql/ha_heap.cc:
        Trivial merge
      sql/ha_innodb.cc:
        Auto merge (Code already existed in 5.0)
      sql/item_cmpfunc.cc:
        Simple merge
      sql/item_func.cc:
        Simple merge
      sql/item_row.cc:
        Simple merge
      sql/item_strfunc.cc:
        Simple merge
      sql/item_subselect.cc:
        Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
      9f04f9d0
  2. 09 Feb, 2005 24 commits