1. 18 Feb, 2005 1 commit
    • unknown's avatar
      WL# 2094, This patch is on top of 1.1814, 1.1846, 1.1856, which contain fixes · 2041ea1f
      unknown authored
      for bugs 8033, 8065, 8535, 8582
      
      This particular changeset contains style changes per code review suggestions 
      and does not contain bug fixes in of itself.
      
      ha_federated.h:
        standardised code style to conform to internals.texi
      ha_federated.cc:
        more code standardisation to conform to internals.texi.
        - casts
        - declarations
        - comments
        - 80 char width
        also, append using string1.append(string2) and not 
        string1.append(string2.c_ptr_quick())
      
      
      sql/ha_federated.cc:
        more code standardisation to conform to internals.texi.
        - casts
        - declarations
        - comments
        - 80 char width
        
        also, append using string1.append(string2) and not 
        string1.append(string2.c_ptr_quick())
      sql/ha_federated.h:
        standardised code style to conform to internals.texi
      2041ea1f
  2. 17 Feb, 2005 35 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3fb79dac
      unknown authored
      into krsna.patg.net:/home/patg/mysql-5.0
      
      
      3fb79dac
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 29f460f2
      unknown authored
      into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
      
      
      29f460f2
    • unknown's avatar
      Fixed Bug#7873. · 307c2140
      unknown authored
      307c2140
    • unknown's avatar
      innodb.test, innodb.result: · 342a9f7f
      unknown authored
        Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
      
      
      mysql-test/r/innodb.result:
        Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
      mysql-test/t/innodb.test:
        Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
      342a9f7f
    • unknown's avatar
      Fixed a result file. Some redundant notes printing had been removed from source · e0875776
      unknown authored
      code, because a warning was given also.
      
      
      e0875776
    • unknown's avatar
      Fixed Bug#8042, "mysqld crashes on sighup". · 679bd87b
      unknown authored
      
      sql/mysql_priv.h:
        Fixed Bug#8042, "mysqld crashes on sighup".
        Removed use of thd. The information added to thd was unneccessary.
      sql/sql_test.cc:
        Fixed Bug#8042, "mysqld crashes on sighup".
        Removed thd->proc_infos.
      679bd87b
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · c2cd419b
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my50
      
      
      c2cd419b
    • unknown's avatar
      ndb - accept ps_7ndb.result · 1b164c76
      unknown authored
      
      mysql-test/r/ps_7ndb.result:
        accept result
      1b164c76
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 · ca021698
      unknown authored
      
      support-files/mysql.spec.sh:
        Auto merged
      ca021698
    • unknown's avatar
      - fixed a changelog entry in the RPM spec file (wrong author) · 6889864b
      unknown authored
      
      support-files/mysql.spec.sh:
        - fixed a changelog entry (wrong author)
      6889864b
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 · 003e7ad1
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      003e7ad1
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1c5881ca
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      1c5881ca
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 908857a0
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      908857a0
    • unknown's avatar
      Do-hpux-depot: · a20f2382
      unknown authored
        Perl script to create HP depot packages.
      
      
      a20f2382
    • unknown's avatar
      select.test: · 531ec55a
      unknown authored
        Manual post-merge
      
      
      mysql-test/t/select.test:
        Manual post-merge
      531ec55a
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · f66111ae
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      f66111ae
    • unknown's avatar
      Manual merge · 869b6557
      unknown authored
      
      mysql-test/r/select.result:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      869b6557
    • unknown's avatar
      WL# 2094 Federated Storage Handler · bc430174
      unknown authored
      This changeset/patch is on top of changesets 1.1814 and 1.1846 
      (for bugs 8033 and 8065) and now fixes bug 8535.
      
      These changes have been built and tested successfully on build.mysql.com
      
      handler.cc:
        Added hooks for federated_db_init() and federated_db_end(), 
        as done with ha_archive_db does, per suggestion by Ingo in
        code review of patch 1.1846.
      ha_federated.h:
        declaration of federated_db_init() and federated_db_end()
      ha_federated.cc:
        - Fixed some indentation problems from indent-ex (mainly to do with
          cases where "variablename += value"
        - Added federated_db_init() and federated_db_end(), as done with
          archive, which also handler more elegantly one of the memory leaks
          from bug 8033 where the federated_mutex was not freed
        - Removed extrenous debug messages in parse_url()
        - Fixed bug 8535, caused by NULL being quoted in write_row. This used to
          work (incorrectly) but a recent change was made in the server that 
          exposed this
      
      
      sql/ha_federated.cc:
         - Fixed some indentation problems from indent-ex (mainly to do with
            cases where "variablename += value"
          - Added federated_db_init() and federated_db_end(), as done with
            archive, which also handler more elegantly one of the memory leaks
            from bug 8033 where the federated_mutex was not freed
          - Removed extrenous debug messages in parse_url()
      sql/ha_federated.h:
        declaration of federated_db_init() and federated_db_end()
      sql/handler.cc:
        Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does.
      bc430174
    • unknown's avatar
      item.h: · 41c09450
      unknown authored
        Revised the fix for bug #7098.
        Corrected the method Item_string::new_item.
      sql_select.cc:
        Revised the fix for bug #7098.
        Aborted the previous modifications.
      
      
      sql/sql_select.cc:
        Revised the fix for bug #7098.
        Aborted the previous modifications.
      sql/item.h:
        Revised the fix for bug #7098.
        Corrected the method Item_string::new_item.
      41c09450
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a4f11cfd
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      a4f11cfd
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 300dde3d
      unknown authored
      into krsna.patg.net:/home/patg/mysql-5.0
      
      
      300dde3d
    • unknown's avatar
      Merge · a58a1dac
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      ndb/include/mgmcommon/ConfigRetriever.hpp:
        Auto merged
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/include/mgmapi/mgmapi.h:
        merge
      a58a1dac
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · d2a69d8f
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      d2a69d8f
    • unknown's avatar
      select.result, select.test: · 7f905da3
      unknown authored
        Added a test case for bug #7098.
      sql_select.cc:
        Fixed bug #7098.
        When a string field was substituted for an equal constant
        the collation of the constant was changed by mistake for 
        the binary collation.
      
      
      sql/sql_select.cc:
        Fixed bug #7098.
        When a string field was substituted for an equal constant
        the collation of the constant was changed by mistake for 
        the binary collation.
      mysql-test/t/select.test:
        Added a test case for bug #7098.
      mysql-test/r/select.result:
        Added a test case for bug #7098.
      7f905da3
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl · efe1ca20
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      
      efe1ca20
    • unknown's avatar
      init_db.sql: · 000255ee
      unknown authored
        Make SQL more readable, substitute hostname at runtime
      mysql-test-run.pl:
        Run init scripts with /bin/sh, ignore return code
      
      
      mysql-test/mysql-test-run.pl:
        Run init scripts with /bin/sh, ignore return code
      mysql-test/lib/init_db.sql:
        Make SQL more readable, substitute hostname at runtime
      000255ee
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · bb46b2bf
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      
      bb46b2bf
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · d475cece
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      
      d475cece
    • unknown's avatar
      Merge · 1e4063f5
      unknown authored
      1e4063f5
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl · a2d3bc8d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      
      mysql-test/t/ps_1general.test:
        Auto merged
      a2d3bc8d
    • unknown's avatar
      Windows compatibility changes of the 'rpl_delete_all', · 3f808996
      unknown authored
      'ps_1general' and 'fulltext_cache' test cases.
      
      
      mysql-test/r/fulltext_cache.result:
        To pass on Windows, round to less digits
      mysql-test/t/fulltext_cache.test:
        To pass on Windows, round to less digits
      mysql-test/t/ps_1general.test:
        To pass on Windows, change \\ to / in result
      mysql-test/t/rpl_delete_all.test:
        To pass on Windows, change \\ to / in result
      mysql-test/mysql-test-run.pl:
        Pass mysqld --console to catch output on Windows
      mysql-test/lib/mtr_process.pl:
        Check error from exec() to avoid becoming a fork() bomb
      3f808996
    • unknown's avatar
      Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 · 89f031b3
      unknown authored
      into mysql.com:/home/dellis/bkl/bug-4.1
      
      
      89f031b3
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1fbeaf71
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      1fbeaf71
    • unknown's avatar
      Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max · 08c2f9e7
      unknown authored
      Recommited, as I made a typo in the previous patch myself =)
      
      
      BUILD/SETUP.sh:
        Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
      08c2f9e7
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · bc22f79f
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      
      bc22f79f
  3. 16 Feb, 2005 4 commits