1. 17 Nov, 2004 8 commits
  2. 16 Nov, 2004 15 commits
  3. 15 Nov, 2004 17 commits
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-4.1-clean · e7fe34b6
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      
      client/mysqldump.c:
        Auto merged
      e7fe34b6
    • unknown's avatar
      compilation failures fixes. mysqldump now compiles on AIX 4.3. · 8fbe68ad
      unknown authored
      
      client/mysqldump.c:
        row[i] is char* so some compilers don't want to put it into a unsigned char*. A C++ comment.
      8fbe68ad
    • unknown's avatar
      Merge · 79d9cb5a
      unknown authored
      
      Makefile.am:
        Auto merged
      client/Makefile.am:
        Auto merged
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/sql_parse.cc:
        SCCS merged
      79d9cb5a
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · a9eb3bce
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      a9eb3bce
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · e75d0098
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      e75d0098
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2e0e77d5
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
      
      2e0e77d5
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 86e76b14
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/petica
      
      86e76b14
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · bb665faf
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      bb665faf
    • unknown's avatar
      valgrind error fix · 7c4c0399
      unknown authored
      7c4c0399
    • unknown's avatar
      fixing a small typo · aed2cd2f
      unknown authored
      aed2cd2f
    • unknown's avatar
      fixed "condition is always false" warnings · 532a32bd
      unknown authored
      532a32bd
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0-ndb · 45c565d3
      unknown authored
      into mysql.com:/home/jonas/src/5.0-ndb-jonas
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      45c565d3
    • unknown's avatar
      wl2240 - ndb partitioning · 55af626d
      unknown authored
      - new test program
      - changed scan take over protocol
      - fixed some bugs
       
      
      
      ndb/include/kernel/signaldata/TcKeyReq.hpp:
        Changed scan takeover to instead
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        return fargment instead of node (as info for scan take-over)
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        remove unused scanNode
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Ship fragment instead of node in scan take over.
        The case where fragment has changed primary will still be handled
          as fragmentdistribution has changed then
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Send fragment wo/ extra bit
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        Fix distribution key length
      ndb/test/ndbapi/Makefile.am:
        new test program for partitioning
      55af626d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 968c8251
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      configure.in:
        Auto merged
      dbug/dbug.c:
        Auto merged
      include/my_dbug.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_isam.cc:
        Auto merged
      sql/ha_isammrg.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      968c8251
    • unknown's avatar
      Bug#6608: MySQL server crash in some query with tis620 character set. · c47ae401
      unknown authored
      The bug was that the function allocates 'a', then changes the value
      of 'a' with the operator ++, and then tries to free 'a'!
      
      
      c47ae401
    • unknown's avatar
      Fixes for information_schema · 008fbb22
      unknown authored
      
      sql/sql_acl.cc:
        Fix for bug 'If user has column privilege with grant option is_grantable is 'NO' in 
        INFORMATION_SCHEMA.COLUMN_PRIVILEGES'
      sql/sql_show.cc:
        removed sprinf
        Fix for 'sp with select from information_schema table crashes server'
        typo fixes
      008fbb22
    • unknown's avatar
      BUG#6353 V2: · 4cc3ea9b
      unknown authored
      Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
      Now is does.  There was one place in the code that used current database 
      instead of the rewrite database.
      
      
      mysql-test/r/rpl_rewrite_db.result:
        New tests
      mysql-test/t/rpl_rewrite_db-slave.opt:
        New tests
      mysql-test/t/rpl_rewrite_db.test:
        New tests
      sql/log_event.cc:
        Added db to set_fields function so that current db is used.
      sql/log_event.h:
        Added db to set_fields function so that current db is used.
      4cc3ea9b