1. 18 Jan, 2007 26 commits
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 · 19a08f58
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
      
      
      client/mysql_upgrade.c:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysys/string.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      19a08f58
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 · f5664a03
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      f5664a03
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40 · 8c162cf7
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
      
      8c162cf7
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · b6846967
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
      
      
      client/mysql_upgrade.c:
        Auto merged
      storage/myisam/mi_packrec.c:
        Use local
      b6846967
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · adfd5490
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
      
      adfd5490
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 · b330e703
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
      
      
      client/mysqlbinlog.cc:
        Auto merged
      configure.in:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisam/mi_packrec.c:
        Use local
      b330e703
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · 5d8e8f78
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
      
      
      client/mysqlbinlog.cc:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_parse.cc:
        Manual merge
      5d8e8f78
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · 628add23
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
      
      
      sql/sql_show.cc:
        Auto merged
      sql/sql_parse.cc:
        Manual merge
      628add23
    • unknown's avatar
      Merge recycle.(none):/src/bug22807/my50-bug22807 · 7f949fcc
      unknown authored
      into  recycle.(none):/src/mysql-5.0-maint
      
      
      client/mysql_upgrade.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/string.c:
        Auto merged
      7f949fcc
    • unknown's avatar
      Merge recycle.(none):/src/bug22807/my51-bug22807 · 3ca0efc4
      unknown authored
      into  recycle.(none):/src/mysql-5.1-maint
      
      3ca0efc4
    • unknown's avatar
      Merge recycle.(none):/src/bug22807/my50-bug22807 · 058903b1
      unknown authored
      into  recycle.(none):/src/bug22807/my51-bug22807
      
      
      client/mysql_upgrade.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/string.c:
        Auto merged
      058903b1
    • unknown's avatar
      Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces · e1e62795
      unknown authored
      - Create space safe strings for system() calls in mysql_upgrade.exe
      
      
      client/mysql_upgrade.c:
        Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
        - Make use of new dynstr_append_os_quoted function to produce a string safe for
        passing to the system() function.                                              
        - Refactor possible source of assertion.
      include/my_sys.h:
        Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
        - Declare dynstr_append_os_quoted function.
      mysys/string.c:
        Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
        - Define dynstr_append_os_quoted function.  This function will concatenate any 
        number of strings, escapes any OS quote in the result then surround the whole  
        affair in another set of quotes which is finally appended to specified         
        DYNAMIC_STRING.
      e1e62795
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 5865c8c6
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
      
      5865c8c6
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · bb389b8a
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
      
      
      configure.in:
        Auto merged
      bb389b8a
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · 3104ca32
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
      
      
      configure.in:
        Auto merged
      3104ca32
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 7ff9a580
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
      
      
      configure.in:
        Use local
      7ff9a580
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3d15cf5d
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
      
      
      configure.in:
        Auto merged
      3d15cf5d
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · f2f95ce6
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
      
      f2f95ce6
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · f9b1e80e
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
      
      f9b1e80e
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 · bcdff3b0
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
      
      
      BUILD/check-cpu:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/my_global.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/mysqladmin.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysys/mf_iocache.c:
        Auto merged
      mysys/my_read.c:
        Auto merged
      mysys/my_seek.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      scripts/mysqlbug.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      storage/myisam/mi_packrec.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      Makefile.am:
        Use local
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Use local
      sql/mysqld.cc:
        Use local
      strings/ctype-extra.c:
        SCCS merged
      bcdff3b0
    • unknown's avatar
      Raise version number after cloning 4.0.29 · ee72f7e5
      unknown authored
      ee72f7e5
    • unknown's avatar
      Bug#25408 5.1 Can't compile on Windows · 70d27850
      unknown authored
      - DBUG_ENTER must be called before assignment on Windows and Netware.
      
      
      storage/myisam/mi_packrec.c:
        Bug#25408 5.1 Can't compile on Windows
        - Call DBUG_ENTER before variable assignment.
      70d27850
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 · 862e94b3
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
      
      
      BUILD/check-cpu:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/type_enum.result:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/mysqladmin.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/type_enum.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      server-tools/instance-manager/Makefile.am:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      server-tools/instance-manager/instance.cc:
        Use remote (global 5.1 version)
      sql/unireg.cc:
        Use remote (5.1 global version)
      mysql-test/t/trigger.test:
        Manual merge
      server-tools/instance-manager/guardian.cc:
        Manual merge
      862e94b3
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1 · 40e5dfe9
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      configure.in:
        Auto merged
      40e5dfe9
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 · 61c57b43
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
      
      
      BUILD/check-cpu:
        Auto merged
      61c57b43
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · 6838ff79
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
      
      
      configure.in:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/buf/buf0flu.c:
        Auto merged
      storage/innobase/buf/buf0lru.c:
        Auto merged
      storage/innobase/include/buf0buf.h:
        Auto merged
      storage/innobase/include/buf0buf.ic:
        Auto merged
      storage/innobase/include/sync0arr.h:
        Auto merged
      storage/innobase/include/sync0rw.h:
        Auto merged
      storage/innobase/include/sync0rw.ic:
        Auto merged
      storage/innobase/include/sync0sync.h:
        Auto merged
      storage/innobase/os/os0sync.c:
        Auto merged
      storage/innobase/sync/sync0arr.c:
        Auto merged
      storage/innobase/sync/sync0rw.c:
        Auto merged
      storage/innobase/sync/sync0sync.c:
        Auto merged
      6838ff79
  2. 17 Jan, 2007 14 commits
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · f3ae6290
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
      
      
      configure.in:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/buf/buf0flu.c:
        Auto merged
      innobase/buf/buf0lru.c:
        Auto merged
      innobase/include/buf0buf.h:
        Auto merged
      innobase/include/buf0buf.ic:
        Auto merged
      innobase/include/sync0arr.h:
        Auto merged
      innobase/include/sync0rw.h:
        Auto merged
      innobase/include/sync0rw.ic:
        Auto merged
      innobase/include/sync0sync.h:
        Auto merged
      innobase/os/os0sync.c:
        Auto merged
      innobase/sync/sync0arr.c:
        Auto merged
      innobase/sync/sync0rw.c:
        Auto merged
      innobase/sync/sync0sync.c:
        Auto merged
      f3ae6290
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · c8e93e33
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
      
      c8e93e33
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 6c6a3e09
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
      
      
      configure.in:
        Use local
      6c6a3e09
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 8f483391
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
      
      
      innobase/buf/buf0buf.c:
        Use local
      innobase/buf/buf0flu.c:
        Use local
      innobase/buf/buf0lru.c:
        Use local
      innobase/include/buf0buf.h:
        Use local
      innobase/include/buf0buf.ic:
        Use local
      innobase/include/sync0arr.h:
        Use local
      innobase/include/sync0rw.h:
        Use local
      innobase/include/sync0rw.ic:
        Use local
      innobase/include/sync0sync.h:
        Use local
      innobase/os/os0sync.c:
        Use local
      innobase/sync/sync0arr.c:
        Use local
      innobase/sync/sync0rw.c:
        Use local
      innobase/sync/sync0sync.c:
        Use local
      8f483391
    • unknown's avatar
      errmsg change · e5ab607b
      unknown authored
      e5ab607b
    • unknown's avatar
      errmsg update from Stefan. · 74ed909a
      unknown authored
      74ed909a
    • 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 zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 · cda1a07e
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
      
      
      BUILD/check-cpu:
        Auto merged
      cda1a07e
    • 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 zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721 · 0a8ed58a
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      BUILD/check-cpu:
        Auto merged
      0a8ed58a
    • 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