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 · 6e5c5b78
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      
      client/mysqldump.c:
        Auto merged
      6e5c5b78
    • unknown's avatar
      compilation failures fixes. mysqldump now compiles on AIX 4.3. · 546e2d31
      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.
      546e2d31
    • unknown's avatar
      Merge · 445c9103
      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
      445c9103
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · fa68d580
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      fa68d580
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 6763a1da
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      6763a1da
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5b209040
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
      
      
      5b209040
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0 · e392cd08
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/petica
      
      
      e392cd08
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · c6388e55
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      c6388e55
    • unknown's avatar
      valgrind error fix · ac9e3a96
      unknown authored
      ac9e3a96
    • unknown's avatar
      fixing a small typo · d17105ae
      unknown authored
      d17105ae
    • unknown's avatar
      fixed "condition is always false" warnings · 252e85e6
      unknown authored
      252e85e6
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0-ndb · 60015bff
      unknown authored
      into mysql.com:/home/jonas/src/5.0-ndb-jonas
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      60015bff
    • unknown's avatar
      wl2240 - ndb partitioning · dc745d74
      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
      dc745d74
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 03d82a46
      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
      03d82a46
    • unknown's avatar
      Bug#6608: MySQL server crash in some query with tis620 character set. · b4786351
      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'!
      
      
      
      b4786351
    • unknown's avatar
      Fixes for information_schema · a59b0fbf
      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
      a59b0fbf
    • unknown's avatar
      BUG#6353 V2: · 58f984ad
      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.
      58f984ad