1. 18 Jan, 2007 1 commit
  2. 17 Jan, 2007 13 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/upward-5.0 · 96fb5951
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      storage/myisam/mi_packrec.c:
        Auto merged
      96fb5951
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 5352ff12
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_locale.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/log_event.cc:
        Manual merge
      5352ff12
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 72cf364f
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      72cf364f
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · cd2edad8
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      configure.in:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/field.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      cd2edad8
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · f58e9f54
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      f58e9f54
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · ae737d69
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      ae737d69
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 0520bf46
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/mysqld.cc:
        Auto merged
      0520bf46
    • unknown's avatar
      Disable symlinks under valgrind builds (again), with a comment. · 9993ebbe
      unknown authored
      
      sql/mysqld.cc:
        Once again, disable symlink.test under valgrind builds. symlink.test
        fails deep in mi_repair - the result of this having been disabled
        for almost 5 years.
      9993ebbe
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · aa85c89d
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_parse.cc:
        Use local.
      aa85c89d
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 5b2569f9
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
      
      
      sql/sql_parse.cc:
        SCCS merged
      5b2569f9
    • unknown's avatar
      Fix a failure of lowercase_tables2 test on powermacg5, introduced · 77f00934
      unknown authored
      by the patch for Bug#4968
      
      
      sql/sql_parse.cc:
        Fix lowercase_tables2 test failure on powermacg5: table_case_name()
        function needed create_info.alias if lowercase_table_names=2, which
        was not set for the stack copy of HA_CREATE_INFO. Move the
        update of create_info.alias from create_table_precheck to 
        mysql_execute_command, so that it is done on the right object.
      77f00934
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max · 6651ade1
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/mysqld.cc:
        Auto merged
      mysql-test/r/ps.result:
        SCCS merged
      mysql-test/t/ps.test:
        Use local
      6651ade1
    • unknown's avatar
      Fix a ps.test failure in 5.0-runtime tree. · 41a9400b
      unknown authored
      
      mysql-test/r/ps.result:
        Update result files.
      mysql-test/t/ps.test:
        Disable result ouptut of SHOW CREATE TABLE: DATA DIRECTORY option
        may be present or absent from the output depending on the build
        otpions and the operating system, so the output is not consistent
        across supported platforms.
      sql/mysqld.cc:
        Remove a tricky #ifdef dependency of --use-symbolic-links on PURIFY
        added in 2002: DEBUG options should not influence server functionality.
        This backfired by producing different output of SHOW CREATE TABLE
        depending on the build options (see also Bug#25677 "With 
        --skip-symbolic-links option on, DATA DIRECTORY clause
        is silently ignored".
      41a9400b
  3. 16 Jan, 2007 11 commits
    • unknown's avatar
      myisam/mi_packrec.c · 845367bf
      unknown authored
          Fix a compile error:  Macro "DBUG_ENTER" must not follow an executable statement.
      
      
      myisam/mi_packrec.c:
        Fix a compile error:  Macro "DBUG_ENTER" must not follow an executable statement.
      845367bf
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 8f2ecf37
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/ps.test:
        Use local.
      mysql-test/t/backup.test:
        SCCS merged
      8f2ecf37
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · fa182693
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      mysql-test/t/backup.test:
        Auto merged
      mysql-test/t/ps.test:
        Manual merge.
      fa182693
    • unknown's avatar
      A fix for the broken 4.1-runtime tree. · 4f70925b
      unknown authored
      
      mysql-test/t/backup.test:
        Backport a patch for sporadically failing myisam.test (and now ps.test)
        from 5.0. The cause was in backup.test not cleaning up tables in
        mysqltest-vardir/tmp after itself.
      mysql-test/t/ps.test:
        Add additional protection against possible failure in the middle of
        backup.test
      4f70925b
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 2987a702
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_select.cc:
        Auto merged
      2987a702
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 58ed5cc9
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
        Auto merged
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Auto merged
      BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
        Auto merged
      BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/dict/dict0dict.c:
        Auto merged
      storage/innobase/fil/fil0fil.c:
        Auto merged
      storage/innobase/ha/ha0ha.c:
        Auto merged
      storage/innobase/include/hash0hash.h:
        Auto merged
      storage/innobase/lock/lock0lock.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      configure.in:
        Use local
      sql/sql_parse.cc:
        Use local
      sql/sql_table.cc:
        Use local
      mysql-test/t/ps.test:
        SCCS merged
      58ed5cc9
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.1-root · 31839811
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      31839811
    • unknown's avatar
      configure.in : Fix a dependency problem for "extra/" which shows up only in RPM builds. · 14aa46c4
      unknown authored
      
      configure.in:
        Some files in "extra/", notably "comp_err", depend on "dbug/libdbug.a",
        so "dbug/" must be a target before "extra/" is attempted.  Fix this.
      14aa46c4
    • unknown's avatar
      Post-merge fixes. · a242b20d
      unknown authored
      
      sql/sql_insert.cc:
        Removing HAVE_ROW_BASED_REPLICATION conditional that is no longer used.
      a242b20d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 1309ad53
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
      
      1309ad53
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 1e019609
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
      
      1e019609
  4. 15 Jan, 2007 15 commits
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · e4fcfa3c
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-6298
      
      e4fcfa3c
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · 19eb3f36
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-root
      
      
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
        Auto merged
      BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      server-tools/instance-manager/listener.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/heap/hp_block.c:
        Auto merged
      storage/heap/hp_write.c:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/dict/dict0dict.c:
        Auto merged
      storage/innobase/fil/fil0fil.c:
        Auto merged
      storage/innobase/ha/ha0ha.c:
        Auto merged
      storage/innobase/include/hash0hash.h:
        Auto merged
      storage/innobase/lock/lock0lock.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
        SCCS merged
      mysql-test/t/view.test:
        Manual merge.
      19eb3f36
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1e6c9442
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      1e6c9442
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 4102755d
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      4102755d
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 9d139ae9
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      sql/sql_parse.cc:
        Auto merged
      9d139ae9
    • unknown's avatar
      A post-merge fix. · e394ffc5
      unknown authored
      
      sql/sql_parse.cc:
        A post-merge fix (broken alter_table.test): restore Svoj's fix
        for Bug#23404 lost during merge.
      e394ffc5
    • unknown's avatar
      Raise version number after cloning 5.0.34 · f6015ed5
      unknown authored
      f6015ed5
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 932a29e7
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/mysql.dsw:
        Auto merged
      VC++Files/mysqldemb/mysqldemb.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      VC++Files/sql/mysqldmax.dsp:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/ha/ha0ha.c:
        Auto merged
      innobase/include/hash0hash.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      932a29e7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · d0520b43
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
      
      d0520b43
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · a2ce56e7
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
      
      
      sql/sql_select.cc:
        Auto merged
      a2ce56e7
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push · adbcc379
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-4968-to-push
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Use local
      adbcc379
    • unknown's avatar
      Manual merge. · d8adfeeb
      unknown authored
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      d8adfeeb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime · 8f28774b
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      8f28774b
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1 · 61c9f104
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-4968-null-merge
      
      
      mysql-test/r/ps.result:
        Use local.
      mysql-test/r/sp.result:
        Use local
      mysql-test/t/ps.test:
        Use local
      mysql-test/t/sp.test:
        Use local
      sql/mysql_priv.h:
        Use local
      sql/sql_class.h:
        Use local
      sql/sql_insert.cc:
        Use local
      sql/sql_lex.cc:
        Use local
      sql/sql_lex.h:
        Use local
      sql/sql_list.h:
        Use local
      sql/sql_parse.cc:
        Use local
      sql/sql_show.cc:
        Use local
      sql/sql_table.cc:
        Use local
      sql/sql_yacc.yy:
        Use local
      61c9f104
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2 · bf63b036
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
      
      
      mysql-test/t/ndb_lock.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Manual merge.
      bf63b036