1. 30 Nov, 2006 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 2daac683
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      configure.in:
        Auto merged
      include/my_pthread.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      server-tools/instance-manager/guardian.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      sql/item_create.cc:
        manual merge
      2daac683
    • unknown's avatar
      After merge fixes · 4294bb89
      unknown authored
      Marked some functions as noreturn
      
      
      sql/mysql_priv.h:
        Marked some functions as noreturn
      storage/federated/ha_federated.cc:
        After merge fix
      storage/myisam/ft_boolean_search.c:
        Removed duplicate code
      storage/myisam/myisamchk.c:
        Added LINT_INIT()
      storage/myisam/myisampack.c:
        After merge fix
      storage/myisam/sort.c:
        Indentation fixup
      4294bb89
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.0 · b2c471ce
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      client/mysql.cc:
        Auto merged
      cmd-line-utils/readline/bind.c:
        Auto merged
      cmd-line-utils/readline/histfile.c:
        Auto merged
      extra/yassl/taocrypt/include/algebra.hpp:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_tree.h:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      server-tools/instance-manager/guardian.cc:
        Auto merged
      server-tools/instance-manager/portability.h:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/gen_lex_hash.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp_cache.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/heap/hp_clear.c:
        Auto merged
      storage/heap/hp_write.c:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/innobase/os/os0file.c:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      client/mysqldump.c:
        Manual merge
      client/mysqltest.c:
        Manual merge
      extra/replace.c:
        Manual merge
      libmysql/libmysql.c:
        Manual merge
      mysys/base64.c:
        Manual merge
      sql/ha_ndbcluster.cc:
        Manual merge
      sql/handler.cc:
        Manual merge
      sql/item_strfunc.cc:
        Manual merge
      sql/item_timefunc.cc:
        Manual merge
      sql/log.cc:
        Manual merge
      sql/opt_range.cc:
        Manual merge
      sql/password.c:
        Manual merge
      sql/sp.cc:
        Manual merge
      sql/sql_base.cc:
        Manual merge
      sql/sql_cache.cc:
        Manual merge
      sql/sql_db.cc:
        Manual merge
      sql/sql_rename.cc:
        Manual merge
      sql/sql_select.cc:
        Manual merge
      sql/sql_show.cc:
        Manual merge
      sql/sql_trigger.cc:
        Manual merge
      sql/sql_update.cc:
        Manual merge
      sql/tztime.cc:
        Manual merge
      storage/archive/ha_archive.cc:
        Manual merge
      storage/federated/ha_federated.cc:
        Manual merge
      storage/myisam/mi_create.c:
        Manual merge
      storage/myisam/myisampack.c:
        Manual merge
      storage/myisammrg/myrg_rkey.c:
        Manual merge
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Manual merge
      storage/ndb/src/ndbapi/Ndb.cpp:
        Manual merge
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Manual merge
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Manual merge
      storage/ndb/src/ndbapi/Ndblist.cpp:
        Manual merge
      b2c471ce
    • unknown's avatar
      Don't abort if we call my_thread_end() multiple times · 346557a9
      unknown authored
      Fixed new introduced bug in my_time.c
      
      
      BitKeeper/deleted/.del-valgrind.supp.orig:
        Delete: mysql-test/valgrind.supp.orig
      mysys/my_thr_init.c:
        More comments
        Don't abort if we call my_thread_end() multiple times
      sql-common/my_time.c:
        Fixed wrong patch in last commit
      sql/sql_cache.cc:
        Fixed old bad merge (not critical)
      sql/tztime.cc:
        Portability fix
      346557a9
    • unknown's avatar
      Fixed compiler warnings · ece6b7e1
      unknown authored
      Don't assert if my_thread_end() is called twice (common case)
      
      
      client/mysql.cc:
        Removed not used variables
      client/mysqldump.c:
        Fixed compiler warnings
      client/mysqltest.c:
        Fixed compiler warnings
      cmd-line-utils/readline/bind.c:
        Fixed compiler warnings
      cmd-line-utils/readline/histfile.c:
        Fixed compiler warnings
      extra/replace.c:
        Fixed compiler warning on windows
      extra/yassl/taocrypt/include/algebra.hpp:
        Fixed compiler warnings
      heap/hp_write.c:
        Fixed compiler warnings
      innobase/os/os0file.c:
        Fixed compiler warnings
      libmysql/libmysql.c:
        Call my_end()/my_thread_end last.
        my_end() calls free_charsets(), which allowed me to move the call
      myisam/myisampack.c:
        Fixed compiler warnings
      myisammrg/myrg_rkey.c:
        Fixed compiler warnings
      mysys/my_thr_init.c:
        More comments
        Don't assert if my_thread_end() is called twice (common case)
      ndb/src/mgmapi/mgmapi.cpp:
        Fixed compiler warnings
      ndb/src/ndbapi/Ndb.cpp:
        Fixed compiler warnings
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Fixed compiler warnings
      ndb/src/ndbapi/NdbTransaction.cpp:
        Fixed compiler warnings
      ndb/src/ndbapi/Ndblist.cpp:
        Fixed compiler warnings
      server-tools/instance-manager/guardian.cc:
        Removed not used variable
      server-tools/instance-manager/portability.h:
        Removed duplicated symbol
      sql/gen_lex_hash.cc:
        Fixed compiler warning
      sql/ha_archive.cc:
        Fixed compiler warnings
      sql/ha_ndbcluster.cc:
        Fixed compiler warnings
      sql/mysqld.cc:
        Fixed compiler warnings
      sql/sql_cache.cc:
        Fixed compiler warnings
        Fixed DBUG_PRINT strings to be consistent with 5.1
      sql/tztime.cc:
        Fixed compiler warnings
      sql/uniques.cc:
        Fixed compiler warnings
      ece6b7e1
    • unknown's avatar
      Bug #24487 Valgrind: uninited byte in table->record[1] in binlog code for rbr + inno db · e11d8d5a
      unknown authored
      The reason of this valgrind's compaint is not a bug but rather a feature of bitwise ops:
      for any value of the byte x
      x | 1 -> 1,  and x & 0 -> 0.
      x, being a null_byte part of record[1] can be left unassigned even after
      ha_innobase::index_read_idx because the above and still be correct.
      Addding a check memory upon the invocation of the function can detect this fact
      long before record[1], old record, is eventually passed to my_write.
      
      Fixed with initialization of record[1]'s null_bytes part in open_table_from_share.
      
      
      sql/table.cc:
        initialization of null-bytes for valgrind.
      e11d8d5a
    • unknown's avatar
      Fixed portability issue in my_thr_init.c (was added in my last push) · 47cca173
      unknown authored
      Fixed compiler warnings (detected by VC++):
      - Removed not used variables
      - Added casts
      - Fixed wrong assignments to bool
      - Fixed wrong calls with bool arguments
      - Added missing argument to store(longlong), which caused wrong store method to be called.
      
      
      
      client/mysqldump.c:
        Removed compiler warning
      heap/hp_clear.c:
        Removed compiler warning
      include/my_global.h:
        Removed compiler warning
      include/my_tree.h:
        Changed memory limits from int to ulong
        (Allowed me to get rid of some compiler warnings)
      myisam/mi_create.c:
        Removed compiler warning
      myisam/myisampack.c:
        Removed compiler warning
      mysys/base64.c:
        Removed compiler warning
      mysys/my_thr_init.c:
        Fixed portability issue (detected on windows)
        Added DBUG_ASSERT to detect if we call my_thread_end() too many times
        Don't wait if THR_thread_count == -1 (error condition)
      mysys/tree.c:
        Removed compiler warning
      sql/field.cc:
        Removed compiler warning
        Fixed wrong parameter to check_date()
        Added missing argument to store(longlong)
      sql/ha_archive.cc:
        Removed compiler warning
      sql/ha_federated.cc:
        Removed compiler warning
      sql/ha_innodb.cc:
        Removed not used variable
      sql/handler.cc:
        Removed not used variable
        Fixed wrong if (we didn't detect if rollback or commit failed). Not critical as value is not yet used
      sql/item.cc:
        Removed compiler warning
      sql/item_func.cc:
        Removed compiler warning
      sql/item_strfunc.cc:
        Removed compiler warning
      sql/item_timefunc.cc:
        Removed compiler warning
      sql/log.cc:
        Removed compiler warning
      sql/mysql_priv.h:
        Removed compiler warning
      sql/opt_range.cc:
        Removed compiler warning
      sql/password.c:
        Removed compiler warning
      sql/set_var.cc:
        Removed compiler warning
      sql/slave.cc:
        Removed compiler warning
      sql/sp.cc:
        Removed compiler warning
      sql/sp_cache.cc:
        Removed compiler warning
      sql/sp_head.cc:
        Removed compiler warning
        Adjusted argument to reserve() to not use up too much memory that we are probably not going to need
      sql/sql_acl.cc:
        Added missing argument to store(longlong)
      sql/sql_base.cc:
        Removed compiler warning
      sql/sql_db.cc:
        Removed compiler warning
      sql/sql_delete.cc:
        Removed compiler warning
      sql/sql_handler.cc:
        Removed not used variable
      sql/sql_lex.h:
        Removed not used variable
      sql/sql_prepare.cc:
        Removed not used variable
      sql/sql_rename.cc:
        Removed not used variable
      sql/sql_select.cc:
        Fixed that select_options are not 'cut'
        Removed some not used variables
        Removed compiler warnings by adding cast
      sql/sql_show.cc:
        Removed not used variables
        Added missing argument to store(longlong)
        Removed compiler warnings
      sql/sql_trigger.cc:
        Removed not used variables
        Added cast to remove compiler warnings
      sql/sql_update.cc:
        Fixed wrong set of bool variable
      sql/sql_view.cc:
        Removed not used variables
        Added cast to get rid of compiler warnings
      sql-common/client.c:
        Fixed compiler warning
      sql-common/my_time.c:
        Fixed wrong argument to check_date()
        Added casts to get rid of compiler warnings
      sql/sql_yacc.yy:
        Removed not used variable
      sql/uniques.cc:
        Changes memory size from uint to ulong
        Added casts to get rid of compiler warnings
      strings/ctype-simple.c:
        Fixed cast to get rid of compiler warnings
      47cca173
    • unknown's avatar
      Fixed compiler warnings (Mostly VC++): · d2e04479
      unknown authored
      - Removed not used variables
      - Changed some ulong parameters/variables to ulonglong (possible serious bug)
      - Added casts to get rid of safe assignment from longlong to long (and similar)
      - Added casts to function parameters
      - Fixed signed/unsigned compares
      - Added some constructores to structures
      - Removed some not portable constructs
      
      Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
      (Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
      
      
      client/mysql.cc:
        Removed not used variable
      client/mysqldump.c:
        Fixed compiler warning
      client/mysqlslap.c:
        Fixed compiler warning
      client/mysqltest.c:
        Fixed compiler warning
      extra/replace.c:
        Fixed compiler warning
      include/my_global.h:
        Fixed compiler warning
      include/mysql_com.h:
        Changed prototype for net_clear()
      libmysql/libmysql.c:
        Changed prototype for net_clear()
      mysys/base64.c:
        Fixed compiler warning (function definition and prototype didn't match)
      mysys/my_thr_init.c:
        AFter merge fixes
      mysys/my_vle.c:
        Fixed compiler warning
      sql/event_data_objects.cc:
        Fixed compiler warning
      sql/event_scheduler.cc:
        Removed not used variable
      sql/field.cc:
        Removed not used variables
        Fixed compiler warning
      sql/gen_lex_hash.cc:
        Fixed compiler warning
      sql/ha_partition.h:
        Fixed compiler warning
      sql/handler.cc:
        Fixed compiler warning
      sql/item.cc:
        Fixed compiler warning
      sql/item_create.cc:
        Fixed compiler warning
      sql/item_func.cc:
        Fixed compiler warning
      sql/item_strfunc.cc:
        Fixed compiler warning
      sql/item_timefunc.cc:
        Fixed compiler warning
      sql/item_xmlfunc.cc:
        Fixed compiler warning
      sql/log.cc:
        Fixed compiler warning
      sql/log_event.cc:
        Fixed compiler warning
      sql/log_event.h:
        Fixed compiler warning
      sql/mysql_priv.h:
        Fixed too short 'select_type'
      sql/net_serv.cc:
        Added argument to net_clear() if we should empty the communication buffer.
      sql/opt_range.cc:
        Fixed compiler warning
      sql/partition_info.cc:
        Fixed compiler warning
      sql/rpl_injector.h:
        Fixed compiler warning
      sql/set_var.cc:
        Fixed compiler warning
      sql/slave.cc:
        Fixed compiler warning
      sql/sp_head.cc:
        Fixed compiler warning
      sql/sql_base.cc:
        Fixed compiler warning
      sql/sql_db.cc:
        Fixed compiler warning
      sql/sql_delete.cc:
        Fixed compiler warning
      sql/sql_insert.cc:
        Fixed compiler warning
      sql/sql_lex.h:
        Fixed compiler warning
      sql/sql_parse.cc:
        Fixed compiler warning
      sql/sql_partition.cc:
        Fixed compiler warning
      sql/sql_plugin.cc:
        Fixed compiler warning
      sql/sql_prepare.cc:
        Fixed compiler warning
      sql/sql_rename.cc:
        Fixed compiler warning
      sql/sql_select.cc:
        Fixed compiler warning
      sql/sql_show.cc:
        Fixed compiler warning
      sql/sql_table.cc:
        Fixed compiler warning
      sql/sql_trigger.cc:
        Fixed compiler warning
      sql-common/client.c:
        Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
      sql-common/my_time.c:
        Fixed compiler warning
      sql/sql_union.cc:
        Fixed compiler warning
      sql/sql_update.cc:
        Fixed compiler warning
      sql/sql_view.cc:
        Fixed compiler warning
      sql/sql_yacc.yy:
        Fixed compiler warning
      sql/table.cc:
        Fixed compiler warning
      storage/archive/azio.c:
        Fixed compiler warning
      storage/csv/ha_tina.cc:
        Removed not used code
      storage/myisam/mi_unique.c:
        Fixed compiler warning
      storage/ndb/include/util/OutputStream.hpp:
        Fixed compiler warning
      storage/ndb/include/util/SocketAuthenticator.hpp:
        Fixed compiler warning
      storage/ndb/src/kernel/vm/Pool.hpp:
        Fixed compiler warning
      strings/ctype-simple.c:
        Fixed compiler warning
      strings/my_strchr.c:
        Fixed compiler warning
      d2e04479
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f513b974
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      f513b974
    • unknown's avatar
      A post-merge fix: fix the failing trigger-grant.test. · 2002e4bc
      unknown authored
      
      sql/sql_trigger.cc:
        Another post-merge fix: make TRIGGER privilege work again, after
        IF EXISTS refactoring.
      2002e4bc
  2. 29 Nov, 2006 30 commits
    • unknown's avatar
      A post-merge fix. · c7c560f6
      unknown authored
      
      mysql-test/r/func_str.result:
        Update results (a post-merge fix).
      c7c560f6
    • unknown's avatar
      A post-merge fix. · 400b094c
      unknown authored
      400b094c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5c6fdb83
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/lib/mtr_io.pl:
        Auto merged
      mysql-test/r/im_daemon_life_cycle.result:
        Auto merged
      mysql-test/r/im_life_cycle.result:
        Auto merged
      mysql-test/r/rpl_trigger.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      mysql-test/t/im_life_cycle.imtest:
        Auto merged
      mysql-test/t/im_utils.imtest:
        Auto merged
      mysql-test/t/rpl_trigger.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Use local.
      mysql-test/r/func_str.result:
        SCCS merged
      mysql-test/t/func_str.test:
        Manual merge.
      sql/sql_trigger.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      5c6fdb83
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 74cfb1ed
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      74cfb1ed
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 677294e5
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      677294e5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f1bb5185
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      f1bb5185
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f896d2b
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      5f896d2b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 1d31140e
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      1d31140e
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.0 · a7b57508
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/heap.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/type_bit.result:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      mysys/my_thr_init.c:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      sql/sql_class.h:
        Manual merge
      sql/table.cc:
        Manual merge
      a7b57508
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 3bc9dd56
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      Makefile.am:
        Auto merged
      configure.in:
        Auto merged
      sql/field.h:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.h:
        Auto merged
      3bc9dd56
    • unknown's avatar
      Added back sql-bench directory, so that one can more easily run benchmarks on... · 5d2412b0
      unknown authored
      Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
      Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
      Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
      BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
      
      
      sql-bench/test-wisconsin.sh:
        Rename: BitKeeper/deleted/.del-test-wisconsin.sh~c0b86821b5f95f26 -> sql-bench/test-wisconsin.sh
      sql-bench/test-transactions.sh:
        Rename: BitKeeper/deleted/.del-test-transactions.sh~c1c892f10c40caf -> sql-bench/test-transactions.sh
      sql-bench/test-insert.sh:
        Rename: BitKeeper/deleted/.del-test-insert.sh~893bfac9dedb79a7 -> sql-bench/test-insert.sh
      sql-bench/test-select.sh:
        Rename: BitKeeper/deleted/.del-test-select.sh~6d5cc770acf11be6 -> sql-bench/test-select.sh
      sql-bench/test-create.sh:
        Rename: BitKeeper/deleted/.del-test-create.sh~f9a1ea38c191b17a -> sql-bench/test-create.sh
      sql-bench/test-big-tables.sh:
        Rename: BitKeeper/deleted/.del-test-big-tables.sh~5b1b0c5fb623565a -> sql-bench/test-big-tables.sh
      sql-bench/test-connect.sh:
        Rename: BitKeeper/deleted/.del-test-connect.sh~382a728c949ee075 -> sql-bench/test-connect.sh
      sql-bench/test-ATIS.sh:
        Rename: BitKeeper/deleted/.del-test-ATIS.sh~e8ebff7086c95773 -> sql-bench/test-ATIS.sh
      sql-bench/test-alter-table.sh:
        Rename: BitKeeper/deleted/.del-test-alter-table.sh~eba6cfa9972fcced -> sql-bench/test-alter-table.sh
      sql-bench/innotest2b.sh:
        Rename: BitKeeper/deleted/.del-innotest2b.sh~7b99ece835e8dff3 -> sql-bench/innotest2b.sh
      sql-bench/run-all-tests.sh:
        Rename: BitKeeper/deleted/.del-run-all-tests.sh~41d6da1cf211ee95 -> sql-bench/run-all-tests.sh
      sql-bench/innotest2.sh:
        Rename: BitKeeper/deleted/.del-innotest2.sh~9c14df528285603 -> sql-bench/innotest2.sh
      sql-bench/innotest2a.sh:
        Rename: BitKeeper/deleted/.del-innotest2a.sh~e01d016a7cafdc0b -> sql-bench/innotest2a.sh
      sql-bench/innotest1a.sh:
        Rename: BitKeeper/deleted/.del-innotest1a.sh~c64f4610ae1e26fe -> sql-bench/innotest1a.sh
      sql-bench/innotest1b.sh:
        Rename: BitKeeper/deleted/.del-innotest1b.sh~aafd0819ae84da7b -> sql-bench/innotest1b.sh
      sql-bench/innotest1.sh:
        Rename: BitKeeper/deleted/.del-innotest1.sh~aa36bce09ca783c7 -> sql-bench/innotest1.sh
      sql-bench/crash-me.sh:
        Rename: BitKeeper/deleted/.del-crash-me.sh~2fa881d0b40339c8 -> sql-bench/crash-me.sh
      sql-bench/graph-compare-results.sh:
        Rename: BitKeeper/deleted/.del-graph-compare-results.sh~7e4e28b3591b4542 -> sql-bench/graph-compare-results.sh
      sql-bench/copy-db.sh:
        Rename: BitKeeper/deleted/.del-copy-db.sh~e8116afb93144ccd -> sql-bench/copy-db.sh
      sql-bench/compare-results.sh:
        Rename: BitKeeper/deleted/.del-compare-results.sh~a9e26e2644c694b3 -> sql-bench/compare-results.sh
      sql-bench/bench-count-distinct.sh:
        Rename: BitKeeper/deleted/.del-bench-count-distinct.sh~a92f174271a831d7 -> sql-bench/bench-count-distinct.sh
      sql-bench/as3ap.sh:
        Rename: BitKeeper/deleted/.del-as3ap.sh~f54eebbd8d34c9b6 -> sql-bench/as3ap.sh
      sql-bench/Comments/Informix.crash-me:
        Rename: BitKeeper/deleted/.del-Informix.crash-me~51ab5b717cefe74 -> sql-bench/Comments/Informix.crash-me
      sql-bench/Comments/postgres.crash-me:
        Rename: BitKeeper/deleted/.del-postgres.crash-me~eacac145c3e30f17 -> sql-bench/Comments/postgres.crash-me
      sql-bench/Comments/Empress.crash-me:
        Rename: BitKeeper/deleted/.del-Empress.crash-me~bdaff0c68ce10f02 -> sql-bench/Comments/Empress.crash-me
      sql-bench/Comments/Adabas.crash-me:
        Rename: BitKeeper/deleted/.del-Adabas.crash-me~ce88ba1a540971ac -> sql-bench/Comments/Adabas.crash-me
      sql-bench/Comments/Access.crash-me:
        Rename: BitKeeper/deleted/.del-Access.crash-me~bb457ec282d939b6 -> sql-bench/Comments/Access.crash-me
      sql-bench/Comments/postgres.benchmark:
        Rename: BitKeeper/deleted/.del-postgres.benchmark~4d30890732b784a -> sql-bench/Comments/postgres.benchmark
      sql-bench/Comments/mysql.benchmark:
        Rename: BitKeeper/deleted/.del-mysql.benchmark~4d8729c0937456fc -> sql-bench/Comments/mysql.benchmark
      sql-bench/Comments/FrontBase.benchmark:
        Rename: BitKeeper/deleted/.del-FrontBase.benchmark~217041ef18274c2e -> sql-bench/Comments/FrontBase.benchmark
      sql-bench/Comments/interbase:
        Rename: BitKeeper/deleted/.del-interbase~cdad59622b4d6f3 -> sql-bench/Comments/interbase
      sql-bench/uname.bat:
        Rename: BitKeeper/deleted/.del-uname.bat~a6d933d2ee9314c -> sql-bench/uname.bat
      sql-bench/pwd.bat:
        Rename: BitKeeper/deleted/.del-pwd.bat~9b64050849abf51 -> sql-bench/pwd.bat
      sql-bench/example.bat:
        Rename: BitKeeper/deleted/.del-example.bat~22d0170bccf0f030 -> sql-bench/example.bat
      sql-bench/Makefile.am:
        Rename: BitKeeper/deleted/.del-Makefile.am~7b07da85b2e9375 -> sql-bench/Makefile.am
      sql-bench/Data/ATIS/transport.txt:
        Rename: BitKeeper/deleted/.del-transport.txt~fa4ca40735f8354c -> sql-bench/Data/ATIS/transport.txt
      sql-bench/Data/ATIS/time_zone.txt:
        Rename: BitKeeper/deleted/.del-time_zone.txt~4171f9ca732f65c0 -> sql-bench/Data/ATIS/time_zone.txt
      sql-bench/Data/Wisconsin/tenk.data:
        Rename: BitKeeper/deleted/.del-tenk.data~6aeaebdd534e458e -> sql-bench/Data/Wisconsin/tenk.data
      sql-bench/Data/Wisconsin/onek.data:
        Rename: BitKeeper/deleted/.del-onek.data~6cd1edaf596a7f7 -> sql-bench/Data/Wisconsin/onek.data
      sql-bench/Data/ATIS/stop1.txt:
        Rename: BitKeeper/deleted/.del-stop1.txt~f09ba164ad44a288 -> sql-bench/Data/ATIS/stop1.txt
      sql-bench/Data/ATIS/time_interval.txt:
        Rename: BitKeeper/deleted/.del-time_interval.txt~a1def62e267a59b2 -> sql-bench/Data/ATIS/time_interval.txt
      sql-bench/Data/ATIS/stop.txt:
        Rename: BitKeeper/deleted/.del-stop.txt~31fb564e1f415e34 -> sql-bench/Data/ATIS/stop.txt
      sql-bench/Data/ATIS/restriction.txt:
        Rename: BitKeeper/deleted/.del-restriction.txt~6ae208924617784a -> sql-bench/Data/ATIS/restriction.txt
      sql-bench/Data/ATIS/state.txt:
        Rename: BitKeeper/deleted/.del-state.txt~9dd470ce14075b90 -> sql-bench/Data/ATIS/state.txt
      sql-bench/Data/ATIS/restrict_class.txt:
        Rename: BitKeeper/deleted/.del-restrict_class.txt~2f741bf0ea498f84 -> sql-bench/Data/ATIS/restrict_class.txt
      sql-bench/Data/ATIS/month_name.txt:
        Rename: BitKeeper/deleted/.del-month_name.txt~4c44f7a323d57d92 -> sql-bench/Data/ATIS/month_name.txt
      sql-bench/Data/ATIS/restrict_carrier.txt:
        Rename: BitKeeper/deleted/.del-restrict_carrier.txt~925b5492f3f9cba3 -> sql-bench/Data/ATIS/restrict_carrier.txt
      sql-bench/Data/ATIS/ground_service.txt:
        Rename: BitKeeper/deleted/.del-ground_service.txt~1087e477e86e84c -> sql-bench/Data/ATIS/ground_service.txt
      sql-bench/Data/ATIS/food_service.txt:
        Rename: BitKeeper/deleted/.del-food_service.txt~66d95a150c28458 -> sql-bench/Data/ATIS/food_service.txt
      sql-bench/Data/ATIS/flight_day.txt:
        Rename: BitKeeper/deleted/.del-flight_day.txt~76868d6d265d441e -> sql-bench/Data/ATIS/flight_day.txt
      sql-bench/Data/ATIS/flight_fare.txt:
        Rename: BitKeeper/deleted/.del-flight_fare.txt~d7322593c8530487 -> sql-bench/Data/ATIS/flight_fare.txt
      sql-bench/Data/ATIS/flight_class.txt:
        Rename: BitKeeper/deleted/.del-flight_class.txt~1801101474c29098 -> sql-bench/Data/ATIS/flight_class.txt
      sql-bench/Data/ATIS/fconnection.txt:
        Rename: BitKeeper/deleted/.del-fconnection.txt~e0ef6a8b5560a713 -> sql-bench/Data/ATIS/fconnection.txt
      sql-bench/Data/ATIS/flight.txt:
        Rename: BitKeeper/deleted/.del-flight.txt~e5065423760e99eb -> sql-bench/Data/ATIS/flight.txt
      sql-bench/Data/ATIS/fare.txt:
        Rename: BitKeeper/deleted/.del-fare.txt~ea0652f490bc24a6 -> sql-bench/Data/ATIS/fare.txt
      sql-bench/Data/ATIS/day_name.txt:
        Rename: BitKeeper/deleted/.del-day_name.txt~f813b215955d894c -> sql-bench/Data/ATIS/day_name.txt
      sql-bench/Data/ATIS/dual_carrier.txt:
        Rename: BitKeeper/deleted/.del-dual_carrier.txt~a7dd776224fbd92b -> sql-bench/Data/ATIS/dual_carrier.txt
      sql-bench/Data/ATIS/date_day.txt:
        Rename: BitKeeper/deleted/.del-date_day.txt~4e9a282fcf54cfd8 -> sql-bench/Data/ATIS/date_day.txt
      sql-bench/Data/ATIS/compound_class.txt:
        Rename: BitKeeper/deleted/.del-compound_class.txt~d4a2f1b7f96340b9 -> sql-bench/Data/ATIS/compound_class.txt
      sql-bench/Data/ATIS/connect_leg.txt:
        Rename: BitKeeper/deleted/.del-connect_leg.txt~f97b6e94e108bb36 -> sql-bench/Data/ATIS/connect_leg.txt
      sql-bench/Data/ATIS/code_description.txt:
        Rename: BitKeeper/deleted/.del-code_description.txt~f9117373e438b0e2 -> sql-bench/Data/ATIS/code_description.txt
      sql-bench/Data/ATIS/city.txt:
        Rename: BitKeeper/deleted/.del-city.txt~d96dd6d073344d2e -> sql-bench/Data/ATIS/city.txt
      sql-bench/Data/ATIS/class_of_service.txt:
        Rename: BitKeeper/deleted/.del-class_of_service.txt~21f6b9848b8c76d -> sql-bench/Data/ATIS/class_of_service.txt
      sql-bench/Data/ATIS/airport_service.txt:
        Rename: BitKeeper/deleted/.del-airport_service.txt~6ee6d5b852b3e38 -> sql-bench/Data/ATIS/airport_service.txt
      sql-bench/Data/ATIS/airline.txt:
        Rename: BitKeeper/deleted/.del-airline.txt~a79f8eadf853f2c8 -> sql-bench/Data/ATIS/airline.txt
      sql-bench/Data/ATIS/airport.txt:
        Rename: BitKeeper/deleted/.del-airport.txt~59c78514130e1f45 -> sql-bench/Data/ATIS/airport.txt
      sql-bench/Data/ATIS/aircraft.txt:
        Rename: BitKeeper/deleted/.del-aircraft.txt~15e4de7ab37c92d3 -> sql-bench/Data/ATIS/aircraft.txt
      sql-bench/TODO:
        Rename: BitKeeper/deleted/.del-TODO~cac6d7a63c426ae5 -> sql-bench/TODO
      sql-bench/limits/sybase.cfg:
        Rename: BitKeeper/deleted/.del-sybase.cfg~c4636b12767b3f14 -> sql-bench/limits/sybase.cfg
      sql-bench/limits/solid-nt4.cfg:
        Rename: BitKeeper/deleted/.del-solid-nt4.cfg~cca779f0c9e29d31 -> sql-bench/limits/solid-nt4.cfg
      sql-bench/limits/solid.cfg:
        Rename: BitKeeper/deleted/.del-solid.cfg~5ae0e4342eadb0fb -> sql-bench/limits/solid.cfg
      sql-bench/limits/pg.cfg:
        Rename: BitKeeper/deleted/.del-pg.cfg~db59cf39a5d417be -> sql-bench/limits/pg.cfg
      sql-bench/limits/mysql.cfg:
        Rename: BitKeeper/deleted/.del-mysql.cfg~9cab20a8771b93cf -> sql-bench/limits/mysql.cfg
      sql-bench/limits/oracle.cfg:
        Rename: BitKeeper/deleted/.del-oracle.cfg~affab21af8f438fd -> sql-bench/limits/oracle.cfg
      sql-bench/limits/mysql-4.1.cfg:
        Rename: BitKeeper/deleted/.del-mysql-4.1.cfg~b6c5e74aefc99e3c -> sql-bench/limits/mysql-4.1.cfg
      sql-bench/limits/mysql-3.23.cfg:
        Rename: BitKeeper/deleted/.del-mysql-3.23.cfg~3cf9d6be54b77a3c -> sql-bench/limits/mysql-3.23.cfg
      sql-bench/limits/mysql-4.0.cfg:
        Rename: BitKeeper/deleted/.del-mysql-4.0.cfg~6c9d63c85b5ef574 -> sql-bench/limits/mysql-4.0.cfg
      sql-bench/limits/mysql-3.22.cfg:
        Rename: BitKeeper/deleted/.del-mysql-3.22.cfg~e706f26a161175cd -> sql-bench/limits/mysql-3.22.cfg
      sql-bench/limits/msql.cfg:
        Rename: BitKeeper/deleted/.del-msql.cfg~52710b12932cceb9 -> sql-bench/limits/msql.cfg
      sql-bench/limits/ms-sql65.cfg:
        Rename: BitKeeper/deleted/.del-ms-sql65.cfg~6b9bc3c460dbee05 -> sql-bench/limits/ms-sql65.cfg
      sql-bench/limits/mimer.cfg:
        Rename: BitKeeper/deleted/.del-mimer.cfg~234e6c1c3c47b612 -> sql-bench/limits/mimer.cfg
      sql-bench/limits/ms-sql.cfg:
        Rename: BitKeeper/deleted/.del-ms-sql.cfg~1907964264d2786a -> sql-bench/limits/ms-sql.cfg
      sql-bench/limits/interbase.cfg:
        Rename: BitKeeper/deleted/.del-interbase.cfg~c6951a0376cc6ff3 -> sql-bench/limits/interbase.cfg
      sql-bench/limits/interbase-dialect3.cfg:
        Rename: BitKeeper/deleted/.del-interbase-dialect3.cfg~46277bdfc74c667a -> sql-bench/limits/interbase-dialect3.cfg
      sql-bench/limits/interbase-superserver.cfg:
        Rename: BitKeeper/deleted/.del-interbase-superserver.cfg~22501198689243b0 -> sql-bench/limits/interbase-superserver.cfg
      sql-bench/limits/interbase-dialect1.cfg:
        Rename: BitKeeper/deleted/.del-interbase-dialect1.cfg~659206b5b9a11036 -> sql-bench/limits/interbase-dialect1.cfg
      sql-bench/limits/empress.cfg:
        Rename: BitKeeper/deleted/.del-empress.cfg~1f97f34d6560a499 -> sql-bench/limits/empress.cfg
      sql-bench/limits/frontbase.cfg:
        Rename: BitKeeper/deleted/.del-frontbase.cfg~71369e9c002696e -> sql-bench/limits/frontbase.cfg
      sql-bench/limits/db2.cfg:
        Rename: BitKeeper/deleted/.del-db2.cfg~711099b4d7906959 -> sql-bench/limits/db2.cfg
      sql-bench/limits/access.cfg:
        Rename: BitKeeper/deleted/.del-access.cfg~5239ea3655b7bba0 -> sql-bench/limits/access.cfg
      sql-bench/limits/access_odbc.cfg:
        Rename: BitKeeper/deleted/.del-access_odbc.cfg~34b4cf0eda56c4b1 -> sql-bench/limits/access_odbc.cfg
      sql-bench/limits/Informix.cfg:
        Rename: BitKeeper/deleted/.del-Informix.cfg~b94188e1ececb51b -> sql-bench/limits/Informix.cfg
      sql-bench/limits/Adabas.cfg:
        Rename: BitKeeper/deleted/.del-Adabas.cfg~343ed4e7f8b02111 -> sql-bench/limits/Adabas.cfg
      sql-bench/README:
        Rename: BitKeeper/deleted/.del-README~b1aa0c1bf9f5eb5e -> sql-bench/README
      BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed:
        Delete: sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed
      Makefile.am:
        Added back sql-bench
      configure.in:
        Added back sql-bench
      dbug/dbug.c:
        Fixed memory leak in _db_set()
        This is not a complete fix as we can still get memory leaks if we do any of the following:
        mysqld --debug --debug
        CAll DBUG_SET or DBUG_SET_INITIAL more than once in a program
        Use SET @@global.debug=xxxx
        
        At some point we should fix the above, but this is not critical for normal operation (only for debugging)
        
        Bug #24497 Valgrind warning: get_one_option
        
        Note that all changes to _db_set_ is only a variable access change, and can be ignored while reviewing the bug fix.
      mysql-test/t/flush_read_lock_kill-master.opt:
        Added '+' to option, to be able to use this together with --debug
      mysql-test/valgrind.supp:
        Removed warning that is now fixed
      mysys/ptr_cmp.c:
        Fixed wrong pointer read (probably never used)
      scripts/make_binary_distribution.sh:
        Added back sql_bench
      sql/field.h:
        Removed class function that was identical in parent class
      sql/mysqld.cc:
        Removed some calls to my_thread_init() / my_thread_end() that was not needed.
        Only call DBUG_SET_INITAL, not DBUG_SET
        (Fixes memory leak in dbug)
        Mark some code as deadcode
      sql/net_serv.cc:
        Add information about from where error comes
      sql-bench/bench-init.pl.sh:
        Cleaned up help text
      sql-bench/server-cfg.sh:
        Don't write '/' after server name of no ssl version
      sql-common/client.c:
        Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
        BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
      sql/sql_parse.cc:
        Added comment
      sql/table.h:
        Removed compiler warning
      5d2412b0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 78ade29e
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      78ade29e
    • unknown's avatar
      Ignore some generated files · 193e3427
      unknown authored
      Don't return from my_thread_global_end() until all threads have called my_thread_end()
      Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
      
      
      BitKeeper/etc/ignore:
        added *.gcda *.gcno
      include/my_pthread.h:
        Added my_thread_end_wait_time
        Removed not used thread variables
      mysys/my_thr_init.c:
        Add thread counters.
        Don't return from my_thread_global_end() until all threads have called my_thread_end()
        (Or a timeout (5 seconds) has elapsed)
        This fixed some valgrind warnings
        Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
      193e3427
    • unknown's avatar
      Many files: · c41da42c
      unknown authored
        Changed paths to ndb include directory to include "storage"
      Makefile.am:
        Adjusted path to yaSSL libtool libraries
      ssl.m4:
        Use libtool way of specifying yaSSL libraries
      
      
      config/ac-macros/ssl.m4:
        Use libtool way of specifying yaSSL libraries
      libmysqld/Makefile.am:
        Adjusted path to yaSSL libtool libraries
      storage/ndb/config/type_kernel.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapi.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapitest.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapitools.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_util.mk.am:
        Changed paths to ndb include directory to include "storage"
      c41da42c
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ebb40c86
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      configure.in:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      ebb40c86
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · a1a09c45
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637
      
      
      sql/sql_yacc.yy:
        Auto merged
      a1a09c45
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637 · 9bf4d9e5
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637
      
      
      sql/sql_yacc.yy:
        Auto merged
      9bf4d9e5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 83352bb8
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      83352bb8
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-5.0-build · c68df141
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.1-build
      
      
      Docs/Makefile.am:
        Auto merged
      extra/yassl/taocrypt/benchmark/benchmark.dsp:
        Auto merged
      extra/yassl/taocrypt/taocrypt.dsp:
        Auto merged
      extra/yassl/taocrypt/taocrypt.vcproj:
        Auto merged
      extra/yassl/taocrypt/test.dsp:
        Auto merged
      extra/yassl/testsuite/testsuite.dsp:
        Auto merged
      extra/yassl/yassl.dsp:
        Auto merged
      extra/yassl/yassl.vcproj:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      strings/decimal.c:
        Auto merged
      c68df141
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · f0dd9dd3
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.1-build
      
      
      sql-common/my_time.c:
        Auto merged
      f0dd9dd3
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 4c2a1ef0
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.1-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      4c2a1ef0
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1-build · 0907cd18
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-build
      
      0907cd18
    • unknown's avatar
      BUG#20637: "load data concurrent infile" locks the table · d8d23348
      unknown authored
      Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
      inside a stored routine and MySQL is compiled with Query Cache support
      (this is not in the manual).
      
      The problem was that the condition test of "we are inside stored routine"
      was reversed, thus CONCURRENT _worked only_ from stored routine.  The
      solution is to use proper condition test.
      
      No test case is provided because the test case would require a large
      amount of input, and it's hard to tell is SELECT is really blocked or
      just slow (subject to race).
      
      
      sql/sql_yacc.yy:
        Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT,
        which was reversed, and return valid value if we are in SP.
      d8d23348
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 90ac2513
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
      
      90ac2513
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · e5cdaadc
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      e5cdaadc
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 8d2295b5
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      8d2295b5
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · d1f8c80b
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      d1f8c80b
    • unknown's avatar
      minor fix · 45366d19
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        remove dependency on Data::Dumper, it's not used anywhere
      45366d19
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · 76a41731
      unknown authored
      into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      sql/sql_parse.cc:
        Auto merged
      76a41731
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d1e66a3
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      server-tools/instance-manager/mysql_connection.cc:
        Rollback Monty's removals of explicit casts
      tests/mysql_client_test.c:
        SCCS merged
      6d1e66a3