1. 24 Jan, 2006 12 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var · 773fc77f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      773fc77f
    • unknown's avatar
      Make mysql-test-run.sh compatible · bb8d87bf
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Add a symlink from std_data to var/std_data_ln
      bb8d87bf
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 9684a585
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      9684a585
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9e0240d3
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
      
      
      9e0240d3
    • unknown's avatar
      Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver) · 333b1f85
      unknown authored
        Fill schema tables with data before filesort if it's necessary
      
      
      mysql-test/r/information_schema.result:
        Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
          test result
      mysql-test/t/information_schema.test:
        Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
          test case
      333b1f85
    • unknown's avatar
      Merge · 50cec505
      unknown authored
      
      mysql-test/t/mysqltest.test:
        Update after merge
      50cec505
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 74f670f2
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      74f670f2
    • unknown's avatar
      Fix for bug#15851 Unlistable directories yield no info from information_schema · fbc24f33
      unknown authored
        to skip directories which are not allowed for read
      
      
      mysql-test/r/information_schema.result:
        Fix for bug#15851 Unlistable directories yield no info from information_schema
          test result
      mysql-test/t/information_schema.test:
        Fix for bug#15851 Unlistable directories yield no info from information_schema
          test case
      fbc24f33
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 794e94e4
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
      
      
      794e94e4
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 30382bee
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020
      
      
      30382bee
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var · 8f760dc0
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/rpl000001.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysql-test/t/type_varchar.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Manual merge
      mysql-test/r/mysqltest.result:
        Manual merge
      mysql-test/t/mysqltest.test:
        Manual merge
      mysql-test/t/trigger-compat.test:
        Manual merge, remove the "--text" argument, not portable
      mysql-test/t/trigger-grant.test:
        Manual merge, remove the "--text" argument, not portable
      8f760dc0
    • unknown's avatar
      Make it possible to run mysql-test-run.pl with default test suite in different vardir. · d40f7056
      unknown authored
      
      mysql-test/include/have_outfile.inc:
        Use MYSQLTEST_VARDIR
      mysql-test/include/test_outfile.inc:
        Use MYSQLTEST_VARDIR
      mysql-test/mysql-test-run.pl:
        Create variable $MYSQLTEST_VARDIR that points to  the vardir
        Don't create a symlink from var/ to the physical vardir if it's somewhere else
        Setup a symlink(or copy dir on windows) for std_data so it is available in the physical vardir
        Use "../tmp" as slave-load-tmpdir, since the server is started in var/master-data and slave in var/slave-data they will both find the dumps in "../tmp"
      mysql-test/mysql-test-run.sh:
        Export MYSQLTEST_VARDIR, always pointing at mysql-test/var
      mysql-test/r/backup.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/blackhole.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/loaddata.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/mysqlbinlog.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/mysqltest.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/outfile.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/query_cache.result:
        Add missing drop function
      mysql-test/r/rpl000001.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl000004.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_innodb.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_loaddata.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_loaddata_rule_m.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_loaddata_rule_s.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_loaddatalocal.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/rpl_log.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_misc_functions.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/rpl_replicate_do.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_rewrite_db.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/rpl_timezone.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/symlink.result:
        Use MYSQLTEST_VARDIR
      mysql-test/r/trigger.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/view.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/r/warnings.result:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/backup-master.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/backup.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/blackhole.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/ctype_ucs_binlog.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/im_daemon_life_cycle-im.opt:
        Use MYSQLTEST_VARDIR
      mysql-test/t/im_options_set.imtest:
        Use MYSQLTEST_VARDIR
      mysql-test/t/im_options_unset.imtest:
        Use MYSQLTEST_VARDIR
      mysql-test/t/loaddata.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/myisam.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/mysqlbinlog.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/mysqlbinlog2.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/mysqldump.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/mysqltest.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/ndb_autodiscover.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/outfile.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/query_cache.test:
        Add missing drop function
      mysql-test/t/repair.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl000001.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl000004.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl000009.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl000015-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl000017-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_EE_error.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_charset.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_drop_db.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_flush_log_loop-master.opt:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_flush_log_loop-master.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_flush_log_loop-slave.opt:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_flush_log_loop-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_innodb.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_loaddata.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_loaddata_rule_m.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_loaddata_rule_s.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_loaddatalocal.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_log.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_misc_functions-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_misc_functions.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_replicate_do.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_rewrite_db.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/rpl_rotate_logs-slave.sh:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_rotate_logs.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/rpl_timezone.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/show_check.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/sp-destruct.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/symlink.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/temp_table-master.opt:
        Use MYSQLTEST_VARDIR
      mysql-test/t/trigger-compat.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/trigger-grant.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/trigger.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/type_varchar.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/user_var-binlog.test:
        Use MYSQLTEST_VARDIR
      mysql-test/t/view.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/t/warnings.test:
        Use "../std_data_ln" to find std_data files
      mysql-test/include/sourced.inc:
        New BitKeeper file ``mysql-test/include/sourced.inc''
      mysql-test/include/sourced1.inc:
        New BitKeeper file ``mysql-test/include/sourced1.inc''
      d40f7056
  2. 23 Jan, 2006 7 commits
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3f216c7d
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
      
      
      3f216c7d
    • unknown's avatar
      Changes after initial patch to #15787 · 03ad365b
      unknown authored
      
      zlib/Makefile.am:
        Added a reference to ../include for my_config.h
      zlib/README.MySQL:
        Updated a readme file to emphasize which files we what to keep an eye on
        in case of zlib upgrade.
      zlib/zconf.h:
        restored a code for standard platform dependant definitions
      03ad365b
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4032f5ac
      unknown authored
      into  selena.:H:/MYSQL/src/#15787-mysql-5.0
      
      
      4032f5ac
    • unknown's avatar
      Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1 · dde3f727
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0
      
      
      myisam/ft_update.c:
        Auto merged
      mysql-test/r/fulltext2.result:
        Auto merged
      dde3f727
    • unknown's avatar
      BUG#15699, failure to apply ignore rule for unexisting table. · 1dcfe028
      unknown authored
        
      Since replication rules execute after `mysql_multi_update_prepare' returns we
      delay to `break' in case this functions returns non-zero (some tables are not found) 
      for to examine if there is an ignore rule for a not-found table. By doing that
      it is guaranteed do/ignore replication rules logically preceed opening table routine.
      
      
      sql/sql_parse.cc:
        BUG#15699. We delay to `break' in case of unexisted tables for multi-update.
        First it is checked whether an ignore rule for such a table exists.
        
        More to the fix:
        if (opt_readonly && ...' in two places got be idented because it were
        enclosed explicitly into corresponding `else' groups. For that 
        the preceding lines with `else' were changed in to be 
        `else 
         {'.
        This grouping is necessary to avoid any inattentive
        insertion in between of `else' and belonging to the else 
        `if (opt_readonly && ...' statement.
      mysql-test/r/rpl_multi_update4.result:
        New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''
      mysql-test/t/rpl_multi_update4-slave.opt:
        New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''
      mysql-test/t/rpl_multi_update4.test:
        New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''
      1dcfe028
    • unknown's avatar
      BUG#16489 - utf8 + fulltext leads to corrupt index file. · 0ee28e1a
      unknown authored
      Fixed that UPDATE statement crashes multi-byte charset fulltext index.
      
      
      myisam/ft_update.c:
        Fixed that UPDATE statement crashes multi-byte charset fulltext index.
        While updating, always rewrite multi-byte charset fulltext index.
      mysql-test/r/fulltext2.result:
        Added a testcase for BUG#16489.
      mysql-test/t/fulltext2.test:
        Added a testcase for BUG#16489.
      0ee28e1a
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 2bdcc171
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634
      
      
      sql/sql_select.cc:
        Auto merged
      2bdcc171
  3. 22 Jan, 2006 1 commit
  4. 21 Jan, 2006 6 commits
    • unknown's avatar
      Merging · 49a09cc3
      unknown authored
      
      mysql-test/r/func_gconcat.result:
        merging
      mysql-test/r/type_float.result:
        merging
      49a09cc3
    • unknown's avatar
      Merging · 494bccf0
      unknown authored
      
      mysql-test/ndb/ndbcluster.sh:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/func_math.test:
        Auto merged
      mysql-test/t/type_float.test:
        Auto merged
      sql/spatial.h:
        Auto merged
      mysql-test/r/type_float.result:
        merging
      sql/item_func.cc:
        merging
      494bccf0
    • unknown's avatar
      Merge hf@192.168.21.12:work/mysql-4.1.15429 · ffe11393
      unknown authored
      into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
      
      
      ffe11393
    • unknown's avatar
      Merge hf@192.168.21.12:work/mysql-4.1.14320 · a8e1b468
      unknown authored
      into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
      
      
      a8e1b468
    • unknown's avatar
      Merge hf@192.168.21.12:work/mysql-4.1.9855 · 32fc6800
      unknown authored
      into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
      
      
      sql/item_func.cc:
        Auto merged
      32fc6800
    • unknown's avatar
      Turns out that the bulk interface was not well documented. I fixed the issue... · a207c820
      unknown authored
      Turns out that the bulk interface was not well documented. I fixed the issue in archive and I will go and update the comments in handler next. I should probably also look through the other engines and see if this an issue elsewhere as well. 
      
      
      sql/ha_archive.cc:
        Fixed for bulk_insert
      a207c820
  5. 20 Jan, 2006 3 commits
    • unknown's avatar
      Test case for BUG#16621: INSERTs in Stored Procedures causes data corruption · ff3079c8
      unknown authored
      in the Binary Log.
      
      
      mysql-test/r/rpl_sp.result:
        Update result file.
      mysql-test/t/rpl_sp.test:
        Add test case for BUG#16621: INSERTs in Stored Procedures causes data corruption
        in the Binary Log.
      ff3079c8
    • unknown's avatar
      Fix for BUG#15588: String overrun during sp-vars.test · b688b196
      unknown authored
      The bug appears after implementation of WL#2984
      (Make stored routine variables work according to the standard).
      
      
      mysql-test/r/type_varchar.result:
        Update result file.
      mysql-test/t/type_varchar.test:
        Add a test for BUG#15588.
      sql/field.cc:
        - use memmove() instead of memcpy() -- after implementation of WL#2984
          (Make stored routine variables work according to the standard) it is
          possible to store in the field the value from this field. For instance,
          this can happen for the following statement:
            SET sp_var = SUBSTR(sp_var, 1, 3);
      sql/sp_head.cc:
        - Work correctly with String:
          - String length has to be be reset before use;
          - qs_append() does not allocate memory, so the memory should
            be reserved beforehand.
      sql/sql_select.cc:
        Polishing: should have been done in WL#2984.
      b688b196
    • unknown's avatar
      Fix of fix for BUG#15866. (Actually change the fib() call in sp.test) · 1fe12884
      unknown authored
      
      mysql-test/r/sp.result:
        Updated results.
      mysql-test/t/sp.test:
        Actually change the fib(20) into fib(10).  (Doh!)
      1fe12884
  6. 19 Jan, 2006 11 commits