1. 17 Nov, 2004 2 commits
  2. 16 Nov, 2004 8 commits
  3. 15 Nov, 2004 18 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 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
    • unknown's avatar
      changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first · c60412e7
      unknown authored
          added libs variable for ndbmgmclient used by mysqladmin
          add linkage with @ndb_mgmclient_libs@
          additional options for ndbcluster
          added support for managing the cluster to mysqladmin
          added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
          use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
      
      
      Makefile.am:
        changed compile order, mysqladming with ndbcluster extensions needs ndb to be compiled first
      acinclude.m4:
        added libs variable for ndbmgmclient used by mysqladmin
      client/Makefile.am:
        add linkage with @ndb_mgmclient_libs@
      client/client_priv.h:
        additional options for ndbcluster
      client/mysqladmin.c:
        added support for managing the cluster to mysqladmin
      configure.in:
        added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
      include/my_global.h:
        use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
      c60412e7
    • unknown's avatar
      always let traffic through to api cluster manager in transporter · 166671cc
      unknown authored
          print some info event on api connects with wrong versions
      
      
      BitKeeper/deleted/.del-Makefile.am~91c159ff4011609:
        Delete: ndb/tools/restore/Makefile.am
      ndb/src/common/transporter/TransporterRegistry.cpp:
        let traffic through to api cluster manager as well
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        print some info event on api connects with wrong versions
      166671cc
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c7bc64ab
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      c7bc64ab
  4. 14 Nov, 2004 5 commits
    • unknown's avatar
      Try to lower the probability of a stall of mysqldump AND most client... · 9fcff33c
      unknown authored
      Try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
      (doing FLUSH TABLES first).
      
      
      client/mysqldump.c:
        try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
        (doing FLUSH TABLES first).
      9fcff33c
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 30a9f76b
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      30a9f76b
    • unknown's avatar
    • unknown's avatar
      moved ndb_restore together with rest of the ndb tools · fe27637b
      unknown authored
          kernel includes needed by ndb_restore
          changed link order
          moved LocalConfig to mgmapi
          Moved NdbConfig to Portlib
          mgmapi to use LocalConfig for connectstring parsing instead of it's own
          enable usage of "NULL" connectstring for default
          new ndbmgmclient lib that can be used by e.g. mysqladmin later
          LocalConfig no longer needed here, now in mgmapi
          Send connectstring to mgmapi instead
          added valid connectstring to be with only host without port i.e.
          valid connectstring =host1,host2,host3
          default port will be added
      
      
      ndb/src/common/portlib/NdbConfig.c:
        Rename: ndb/src/common/mgmcommon/NdbConfig.c -> ndb/src/common/portlib/NdbConfig.c
      ndb/include/portlib/NdbConfig.h:
        Rename: ndb/include/mgmcommon/NdbConfig.h -> ndb/include/portlib/NdbConfig.h
      ndb/include/mgmapi/LocalConfig.hpp:
        Rename: ndb/include/mgmcommon/LocalConfig.hpp -> ndb/include/mgmapi/LocalConfig.hpp
      ndb/tools/restore/Makefile.am:
        Rename: ndb/src/kernel/blocks/backup/restore/Makefile.am -> ndb/tools/restore/Makefile.am
      ndb/tools/restore/consumer.cpp:
        Rename: ndb/src/kernel/blocks/backup/restore/consumer.cpp -> ndb/tools/restore/consumer.cpp
      ndb/tools/restore/consumer.hpp:
        Rename: ndb/src/kernel/blocks/backup/restore/consumer.hpp -> ndb/tools/restore/consumer.hpp
      ndb/tools/restore/consumer_printer.hpp:
        Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.hpp -> ndb/tools/restore/consumer_printer.hpp
      ndb/tools/restore/consumer_printer.cpp:
        Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.cpp -> ndb/tools/restore/consumer_printer.cpp
      ndb/tools/restore/consumer_restore.hpp:
        Rename: ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp -> ndb/tools/restore/consumer_restore.hpp
      ndb/tools/restore/main.cpp:
        Rename: ndb/src/kernel/blocks/backup/restore/main.cpp -> ndb/tools/restore/main.cpp
      ndb/tools/restore/consumer_restorem.cpp:
        Rename: ndb/src/kernel/blocks/backup/restore/consumer_restorem.cpp -> ndb/tools/restore/consumer_restorem.cpp
      configure.in:
        moved ndb_restore together with rest of the ndb tools
      ndb/config/type_ndbapitools.mk.am:
        kernel includes needed by ndb_restore
      ndb/src/Makefile.am:
        changed link order
      ndb/src/common/mgmcommon/Makefile.am:
        mived LocalConfig to mgmapi
      ndb/src/common/portlib/Makefile.am:
        Moved NdbConfig to Portlib
      ndb/src/kernel/blocks/backup/Makefile.am:
        moved restore together with rest of ndb tools
      ndb/src/mgmapi/LocalConfig.cpp:
        added valid connectstring to be with only host without port i.e.
        valid connectstring =host1,host2,host3
        default port will be added
      ndb/src/mgmapi/Makefile.am:
        LocalConfig part of the libmgmapi
      ndb/src/mgmapi/mgmapi.cpp:
        mgmapi to use LocalConfig for connectstring parsing instead of it's own
      ndb/src/mgmclient/CommandInterpreter.cpp:
        enable usage of "NULL" connectstring for default
      ndb/src/mgmclient/Makefile.am:
        new ndbmgmclient lib that can be used by e.g. mysqladmin later
      ndb/src/mgmclient/main.cpp:
        LocalConfig no longer needed here, now in mgmapi
        Send connectstring to mgmapi instead
      ndb/tools/Makefile.am:
        add ndb_restore to make of tools
      ndb/tools/restore/Restore.cpp:
        moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
      ndb/tools/restore/Restore.hpp:
        moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
      ndb/tools/restore/consumer_restore.cpp:
        moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
      ndb/tools/waiter.cpp:
        LocalConfig moved
      fe27637b
    • unknown's avatar
      fixed incorrect using of THD::is_fatal_error · 83f6cae4
      unknown authored
      83f6cae4
  5. 13 Nov, 2004 5 commits
    • unknown's avatar
      make information schema libmysqld compatible · c637cf62
      unknown authored
      fixed typo
      
      
      sql/handler.cc:
        fixed typo
      sql/sql_acl.cc:
        make information schema libmysqld compatible
      c637cf62
    • unknown's avatar
      posmerge fixes · 9a837b13
      unknown authored
      
      mysql-test/r/view.result:
        erorr reported
      sql/item.cc:
        removed starnge code
      sql/mysql_priv.h:
        now error represented by Bool value
      sql/sql_parse.cc:
        removed old send_error calls
      sql/sql_select.cc:
        removed starnge code
      sql/sql_show.cc:
        show functions fixed
      sql/table.h:
        now error represented by Bool value
      9a837b13
    • unknown's avatar
      marge · a721d254
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/serbian/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/mysql_priv.h:
        merge
      sql/sql_parse.cc:
        merge
      sql/sql_show.cc:
        merge
      a721d254
    • unknown's avatar
      now my_printf_error is not better then my_error, but my_error call is shorter · 065a55e8
      unknown authored
      used only one implementation of format parser of (printf)
      fixed multistatement
      
      
      include/mysqld_error.h:
        newerror messages
      mysql-test/t/key.test:
        unknown error replaced with real error
      mysys/my_error.c:
        my_error & my_printf_error use my_vsprintf
      sql/field_conv.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/ha_innodb.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/handler.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/item.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/item_cmpfunc.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/item_func.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/item_strfunc.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/lock.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/log.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/parse_file.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/procedure.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/protocol.cc:
        no need reset thd->lex->found_colon to break multiline sequance now, send_error called too late
      sql/repl_failsafe.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/set_var.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/share/czech/errmsg.txt:
        new errors converted from unknown error
      sql/share/danish/errmsg.txt:
        new errors converted from unknown error
      sql/share/dutch/errmsg.txt:
        new errors converted from unknown error
      sql/share/english/errmsg.txt:
        new errors converted from unknown error
      sql/share/estonian/errmsg.txt:
        new errors converted from unknown error
      sql/share/french/errmsg.txt:
        new errors converted from unknown error
      sql/share/german/errmsg.txt:
        new errors converted from unknown error
      sql/share/greek/errmsg.txt:
        new errors converted from unknown error
      sql/share/hungarian/errmsg.txt:
        new errors converted from unknown error
      sql/share/italian/errmsg.txt:
        new errors converted from unknown error
      sql/share/japanese/errmsg.txt:
        new errors converted from unknown error
      sql/share/korean/errmsg.txt:
        new errors converted from unknown error
      sql/share/norwegian-ny/errmsg.txt:
        new errors converted from unknown error
      sql/share/norwegian/errmsg.txt:
        new errors converted from unknown error
      sql/share/polish/errmsg.txt:
        new errors converted from unknown error
      sql/share/portuguese/errmsg.txt:
        new errors converted from unknown error
      sql/share/romanian/errmsg.txt:
        new errors converted from unknown error
      sql/share/russian/errmsg.txt:
        new errors converted from unknown error
      sql/share/serbian/errmsg.txt:
        new errors converted from unknown error
      sql/share/slovak/errmsg.txt:
        new errors converted from unknown error
      sql/share/spanish/errmsg.txt:
        new errors converted from unknown error
      sql/share/swedish/errmsg.txt:
        new errors converted from unknown error
      sql/share/ukrainian/errmsg.txt:
        new errors converted from unknown error
      sql/slave.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sp.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sp_head.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_acl.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_analyse.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_base.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_class.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_db.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_delete.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_handler.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_insert.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_load.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_map.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_parse.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
        multi-row command fixed
      sql/sql_prepare.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
        remover send_error ingected from 4.1
      sql/sql_rename.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_repl.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_select.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_show.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_table.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_trigger.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_udf.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_update.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_view.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/sql_yacc.yy:
        now my_printf_error is not better then my_error, but my_error call is shorter
      sql/table.cc:
        now my_printf_error is not better then my_error, but my_error call is shorter
      strings/my_vsnprintf.c:
        * format support added to my_vsprint
      065a55e8
    • unknown's avatar
      WL#1629: SHOW with WHERE(partially) & · 4e06d372
      unknown authored
      WL#173:  Create Data Dictionary Tables for SHOW Commands
      
      4e06d372
  6. 12 Nov, 2004 2 commits