1. 06 Aug, 2005 1 commit
    • unknown's avatar
      Merge fix · fa695c21
      unknown authored
      
      mysql-test/t/ndb_partition_key.test:
        Fixed constant error codes, replaced with name of constant
      mysql-test/t/partition_error.test:
        Fixed constant error codes, replaced with name of constant
      fa695c21
  2. 05 Aug, 2005 12 commits
    • unknown's avatar
      Fixed ndb_config problems with merge · d6dcd1bf
      unknown authored
      
      storage/ndb/tools/ndb_condig.cpp:
        Rename: ndb/tools/config.cpp -> storage/ndb/tools/ndb_condig.cpp
      storage/ndb/tools/Makefile.am:
        Rename due to mixed names with no case sensitivity
      d6dcd1bf
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · aca6f88e
      unknown authored
      into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
      
      
      BitKeeper/etc/config:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/information_schema_db.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysys/default.c:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      scripts/mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/include/os0file.h:
        Auto merged
      storage/innobase/include/read0read.h:
        Auto merged
      storage/innobase/include/read0types.h:
        Auto merged
      storage/innobase/include/trx0trx.h:
        Auto merged
      storage/innobase/os/os0file.c:
        Auto merged
      storage/innobase/read/read0read.c:
        Auto merged
      storage/innobase/row/row0sel.c:
        Auto merged
      storage/innobase/srv/srv0srv.c:
        Auto merged
      storage/innobase/srv/srv0start.c:
        Auto merged
      storage/innobase/trx/trx0sys.c:
        Auto merged
      storage/innobase/trx/trx0trx.c:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
        Auto merged
      storage/ndb/src/common/portlib/NdbMutex.c:
        Auto merged
      storage/ndb/src/common/portlib/NdbThread.c:
        Auto merged
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.hpp:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      configure.in:
        Manual merge 5.0 -> 5.1
      mysql-test/t/alter_table.test:
        Manual merge 5.0 -> 5.1
      sql/share/errmsg.txt:
        Manual merge 5.0 -> 5.1
      storage/ndb/tools/Makefile.am:
        Manual merge 5.0 -> 5.1
      aca6f88e
    • unknown's avatar
      testcase added to fix for bug #12281 (Geometry & trigger crash) · e13fa8eb
      unknown authored
      
      mysql-test/r/gis.result:
        test result fixed
      mysql-test/t/gis.test:
        testcase added
      e13fa8eb
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 61fbf036
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12281
      
      
      61fbf036
    • unknown's avatar
      Fix for bug #12281 (Geometry: crash in trigger) · be1640e2
      unknown authored
      Field_geom lack size_of method
      
      
      sql/field.h:
        size_of implemented
      be1640e2
    • unknown's avatar
      post-review fix · 719117b3
      unknown authored
      
      server-tools/instance-manager/listener.cc:
        some more cleanup
      719117b3
    • unknown's avatar
      chmod -x new IM files · 69220b00
      unknown authored
      
      server-tools/instance-manager/WindowsService.cpp:
        Change mode to -rw-rw-r--
      server-tools/instance-manager/WindowsService.h:
        Change mode to -rw-rw-r--
      server-tools/instance-manager/port.h:
        Change mode to -rw-rw-r--
      server-tools/instance-manager/mysqlmanager.vcproj:
        Change mode to -rw-rw-r--
      server-tools/instance-manager/IMService.cpp:
        Change mode to -rw-rw-r--
      server-tools/instance-manager/IMService.h:
        Change mode to -rw-rw-r--
      69220b00
    • unknown's avatar
      IM port cleanup · cd3fa684
      unknown authored
      
      server-tools/instance-manager/IMService.cpp:
        coding style fixes: tabs, trailing spaces, offset e.t.c
      server-tools/instance-manager/WindowsService.cpp:
        coding style fixes: tabs, trailing spaces, offset e.t.c
      server-tools/instance-manager/WindowsService.h:
        coding style fixes: tabs, trailing spaces, offset e.t.c
      server-tools/instance-manager/instance.cc:
        cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
      server-tools/instance-manager/listener.cc:
        coding style fixes: tabs, trailing spaces, offset e.t.c
      server-tools/instance-manager/manager.cc:
        coding style fixes: tabs, trailing spaces, offset e.t.c
      server-tools/instance-manager/options.cc:
        coding style fixes: tabs, trailing spaces, offset e.t.c
      server-tools/instance-manager/user_map.cc:
        simplify password file processing
      cd3fa684
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d976f87f
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      d976f87f
    • unknown's avatar
      IM port fixes: fix crash on startup, add more error checking, get rid of unnecessary code. · 85834c3b
      unknown authored
      
      server-tools/instance-manager/commands.cc:
        fix memory leak
      server-tools/instance-manager/guardian.cc:
        don't check pthread_mutex_lock/unlock return value, as it never returns error if properly
        used (no self deadlocks) and initialized
      server-tools/instance-manager/guardian.h:
        prototype fixed
      server-tools/instance-manager/instance_map.cc:
        don't check pthread_mutex_lock/unlock status, as it never returns error if
        properly used (no self deadlocks) and initialized
      server-tools/instance-manager/instance_map.h:
        prototype fixed
      server-tools/instance-manager/listener.cc:
        initialize highest-numbered descriptor to 0 for select before setting it with max(n, sockets[i]),
        ifdef unix-specific code
      server-tools/instance-manager/manager.cc:
        remove commented stuff
      server-tools/instance-manager/options.cc:
        fix crash in load_defaults, which happened on all Unix systems due to
        const char *Options::config_file= NULL. Check return value for GetModuleFileName.
        Get rid of obscure default_config_file[FN_REFLEN]= "/etc/my.cnf"; which was never used
      85834c3b
    • unknown's avatar
      fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames · 7c3f55ec
      unknown authored
      
      mysql-test/r/information_schema.result:
        fix the test case for fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames
      mysql-test/r/information_schema_db.result:
        fix the test case for fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames
      sql/sql_show.cc:
        reorder the structure
        fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames
      sql/table.h:
        reorder the enum
        fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not sort tablenames
      7c3f55ec
    • unknown's avatar
      Fix gcc -ansi -pedantic compilation failure. · 299a394d
      unknown authored
      
      client/client_priv.h:
        Fix a compile failure.
      299a394d
  3. 04 Aug, 2005 27 commits