1. 20 Jul, 2005 1 commit
    • unknown's avatar
      initial import of Windows port of IM. · 875b0e63
      unknown authored
      
      server-tools/instance-manager/commands.cc:
        type cleanups for compiling on Windows
        now using Options::config_file for the location of the single 
        my.cnf file we are using
      server-tools/instance-manager/guardian.cc:
        pthread_mutex_lock and unlock do not return a value on Windows
        so we return 0 in all cases
      server-tools/instance-manager/instance.cc:
        big changes here.
        Had to implement Windows versions of launch_and_wait and kill()
      server-tools/instance-manager/instance.h:
        added some function defs
      server-tools/instance-manager/instance_map.cc:
        pthread_mutex_lock and unlock do not return a value on Windows
        Also, now using only the file named as Options::config_file
      server-tools/instance-manager/instance_options.h:
        added reference to port.h
      server-tools/instance-manager/listener.cc:
        reworked and simplified the socket handling code.
        Added windows versions of the code that sets the sockets to be
        non-blocking and non-inheritable
      server-tools/instance-manager/listener.h:
        change Options to always be a struct.  Really surprised GCC was 
        letting this go.  Options was declared to be struct in some places
        and class in other places.
      server-tools/instance-manager/log.cc:
        added reference to port.h
      server-tools/instance-manager/manager.cc:
        moved all the signal code inside some #ifndef __WIN__ blocks
      server-tools/instance-manager/manager.h:
        change Options to always be a struct.  Really surprised GCC was 
        letting this go.  Options was declared to be struct in some places
        and class in other places.
      server-tools/instance-manager/mysqlmanager.cc:
        added in the Windows service code.
      server-tools/instance-manager/options.cc:
        Added in the windows options for running as a service and the code
        for loading settings only from a single file
      server-tools/instance-manager/options.h:
        added definitions for the new Windows service vars and routines
      server-tools/instance-manager/parse_output.cc:
        added reference to port.h
      server-tools/instance-manager/priv.cc:
        added reference to port.h
      server-tools/instance-manager/priv.h:
        linuxthreads should not be visible on Windows
      server-tools/instance-manager/thread_registry.cc:
        more __WIN__ blocking
      server-tools/instance-manager/user_map.cc:
        fixed passwd file code to handle files with \r\n line endings
      server-tools/instance-manager/IMService.cpp:
        New BitKeeper file ``server-tools/instance-manager/IMService.cpp''
      server-tools/instance-manager/IMService.h:
        New BitKeeper file ``server-tools/instance-manager/IMService.h''
      server-tools/instance-manager/WindowsService.cpp:
        New BitKeeper file ``server-tools/instance-manager/WindowsService.cpp''
      server-tools/instance-manager/WindowsService.h:
        New BitKeeper file ``server-tools/instance-manager/WindowsService.h''
      server-tools/instance-manager/mysqlmanager.vcproj:
        New BitKeeper file ``server-tools/instance-manager/mysqlmanager.vcproj''
      server-tools/instance-manager/port.h:
        New BitKeeper file ``server-tools/instance-manager/port.h''
      875b0e63
  2. 19 Jul, 2005 13 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-readline · 6ae06030
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      6ae06030
    • unknown's avatar
      Bug#10932 - Building server with key limit of 128, makes test cases fail · f1d5c048
      unknown authored
      This patch allows to configure MyISAM for 128 indexes per table.
      The main problem is the key_map, wich is implemented as an ulonglong.
      To get rid of the limit and keep the efficient and flexible
      implementation, the highest bit is now used for all upper keys.
      This means that the lower keys can be disabled and enabled 
      individually as usual and the high keys can only be disabled and
      enabled as a block. That way the existing test suite is still
      applicable, while more keys work, though slightly less efficient.
      To really get more than 64 keys, some defines need to be changed.
      Another patch will address this.
      
      
      include/my_bitmap.h:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Added the declaration for a function that extends the highest bit value
        to all upper bits of a bigger bitmap.
      include/myisam.h:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed MI_MAX_POSSIBLE_KEY to what it was meant for.
        Added a bunch of macros to handle the MyISAM key_map.
      myisam/mi_check.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_create.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_delete.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_extra.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_open.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
        Changed pointer types from signed char* to unsigned char*.
      myisam/mi_preload.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_rsame.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_rsamepos.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_search.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_update.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_write.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/myisamchk.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/myisamdef.h:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed pointer types from signed char* to unsigned char*.
      myisam/myisamlog.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/myisampack.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/sort.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      mysys/my_bitmap.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Added a function that extends the highest bit value
        to all upper bits of a bigger bitmap.
      sql/ha_myisam.cc:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      sql/sql_bitmap.h:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Added a method that extends the highest bit value
        to all upper bits of a bigger bitmap.
      f1d5c048
    • unknown's avatar
      Fix for bug#11057 information_schema: columns table has some questionable contents · a2df1eb8
      unknown authored
        fixed BLOB, TEXT(wrong maximum length), BIT and integer types(wrong numeric_precision value)
      
      
      a2df1eb8
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b8497024
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      b8497024
    • unknown's avatar
      Bug#11577 'show procedure/function status' doesn't work for user with limited access · 11ff7b16
      unknown authored
         changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines
      
      
      11ff7b16
    • unknown's avatar
      Remove the ignored files. · 42b35721
      unknown authored
      
      BitKeeper/deleted/.del-mkinstalldirs~6f3fb2535a57b49a:
        Delete: mkinstalldirs
      BitKeeper/deleted/.del-mkinstalldirs~cc63133db18af2f2:
        Delete: innobase/mkinstalldirs
      42b35721
    • unknown's avatar
      Added mkinstalldirs (an auxiliary autotools symlink) to the ignore · ff9be613
      unknown authored
      list.
      
      
      BitKeeper/etc/ignore:
        Added innobase/mkinstalldirs mkinstalldirs to the ignore list
      innobase/mkinstalldirs:
        Ignore
      mkinstalldirs:
        Ignore
      ff9be613
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0 · f97fefa8
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
      
      
      f97fefa8
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · ded99464
      unknown authored
      into  radha.local:/Users/patg/mysql-build/mysql-5.0
      
      
      ded99464
    • unknown's avatar
      Merge mysqldev@production.mysql.com:jimw/mysql-5.0-readline · 1e3be5e9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-readline
      
      
      1e3be5e9
    • unknown's avatar
      Eric's implentation of OPTIMIZE TABLE and REPAIR TABLE, · f9e4c6e7
      unknown authored
      as well as changes to the test.
      
      
      mysql-test/r/federated.result:
        New test results
      mysql-test/t/federated.test:
        Removed explains per brian's suggestion since on his 64-bit amd, you get 
        different information, something to be ironed out later, as well as it 
        having nothing to do with federated.
      sql/ha_federated.cc:
        - Eric Herman's implementation of repair and optimize!!!
        - Eric's changes to 1EQ0 to FALSE
      sql/ha_federated.h:
        Eric's addition of LEN for each SQL string tokens.
      f9e4c6e7
    • unknown's avatar
      Reimplement use of "config_readline.h" to get readline configuration. · 42d10743
      unknown authored
      
      cmd-line-utils/readline/bind.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/callback.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/compat.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/complete.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/display.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/funmap.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/histexpand.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/histfile.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/history.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/histsearch.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/input.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/isearch.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/keymaps.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/kill.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/macro.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/mbutil.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/misc.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/nls.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/parens.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/readline.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/rltty.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/savestring.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/search.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/shell.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/signals.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/terminal.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/text.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/tilde.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/undo.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/util.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/vi_mode.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/xmalloc.c:
        Include local config_readline.h instead of config.h
      42d10743
    • unknown's avatar
      Upgrade bundled readline to version 5.0. · bb2fb2af
      unknown authored
      
      cmd-line-utils/readline/INSTALL:
        Import readline-5.0
      cmd-line-utils/readline/Makefile.am:
        Import readline-5.0
      cmd-line-utils/readline/README:
        Import readline-5.0
      cmd-line-utils/readline/bind.c:
        Import readline-5.0
      cmd-line-utils/readline/callback.c:
        Import readline-5.0
      cmd-line-utils/readline/chardefs.h:
        Import readline-5.0
      cmd-line-utils/readline/complete.c:
        Import readline-5.0
      cmd-line-utils/readline/configure.in:
        Import readline-5.0
      cmd-line-utils/readline/display.c:
        Import readline-5.0
      cmd-line-utils/readline/funmap.c:
        Import readline-5.0
      cmd-line-utils/readline/histexpand.c:
        Import readline-5.0
      cmd-line-utils/readline/histfile.c:
        Import readline-5.0
      cmd-line-utils/readline/history.c:
        Import readline-5.0
      cmd-line-utils/readline/history.h:
        Import readline-5.0
      cmd-line-utils/readline/histsearch.c:
        Import readline-5.0
      cmd-line-utils/readline/input.c:
        Import readline-5.0
      cmd-line-utils/readline/isearch.c:
        Import readline-5.0
      cmd-line-utils/readline/keymaps.c:
        Import readline-5.0
      cmd-line-utils/readline/kill.c:
        Import readline-5.0
      cmd-line-utils/readline/macro.c:
        Import readline-5.0
      cmd-line-utils/readline/mbutil.c:
        Import readline-5.0
      cmd-line-utils/readline/misc.c:
        Import readline-5.0
      cmd-line-utils/readline/nls.c:
        Import readline-5.0
      cmd-line-utils/readline/parens.c:
        Import readline-5.0
      cmd-line-utils/readline/posixdir.h:
        Import readline-5.0
      cmd-line-utils/readline/readline.c:
        Import readline-5.0
      cmd-line-utils/readline/readline.h:
        Import readline-5.0
      cmd-line-utils/readline/rldefs.h:
        Import readline-5.0
      cmd-line-utils/readline/rlmbutil.h:
        Import readline-5.0
      cmd-line-utils/readline/rlprivate.h:
        Import readline-5.0
      cmd-line-utils/readline/rlstdc.h:
        Import readline-5.0
      cmd-line-utils/readline/rltty.c:
        Import readline-5.0
      cmd-line-utils/readline/rltty.h:
        Import readline-5.0
      cmd-line-utils/readline/rltypedefs.h:
        Import readline-5.0
      cmd-line-utils/readline/search.c:
        Import readline-5.0
      cmd-line-utils/readline/shell.c:
        Import readline-5.0
      cmd-line-utils/readline/signals.c:
        Import readline-5.0
      cmd-line-utils/readline/terminal.c:
        Import readline-5.0
      cmd-line-utils/readline/text.c:
        Import readline-5.0
      cmd-line-utils/readline/tilde.c:
        Import readline-5.0
      cmd-line-utils/readline/undo.c:
        Import readline-5.0
      cmd-line-utils/readline/util.c:
        Import readline-5.0
      cmd-line-utils/readline/vi_mode.c:
        Import readline-5.0
      cmd-line-utils/readline/xmalloc.c:
        Import readline-5.0
      bb2fb2af
  3. 18 Jul, 2005 21 commits
    • unknown's avatar
      After-merge fixes. · cdf03871
      unknown authored
      
      configure.in:
        A hack to ensure that the tree compiles on SuSE 9.0 with -ansi -pedantic
      mysql-test/r/olap.result:
        More post-merge fixes.
      mysql-test/r/rpl_log.result:
        Post-merge fixes. Guilhem: please investigate.
      mysql-test/r/rpl_rotate_logs.result:
        Post-merge fixes. Guilhem: please investigate.
      mysql-test/t/olap.test:
        A post-merge fix.
      cdf03871
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0 · cf8f1dac
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
      
      
      cf8f1dac
    • unknown's avatar
      BUG#11567 Fixed binlog tests on windows. · 481ce989
      unknown authored
      
      sql/log_event.cc:
        BUG#11567 - mysqlbinlog tests failing on Windows.
        Cast was not working as intended with Windows compiler,
        the value of option was being printed instead. Reason
        is that config-win.h has '#define bool BOOL', and on
        Windows BOOL is a typedef for int, which means
        that all casts to bool are really a cast to int. Changed
        to explicitly print a 1 or 0 instead of using cast.
      481ce989
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/mysql-4.1-root · 7f6f31ae
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/rpl_log.result:
        Auto merged
      mysql-test/r/rpl_rotate_logs.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/timezone_grant.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/timezone_grant.test:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      configure.in:
        Manual merge
      mysql-test/r/olap.result:
        Manual merge
      mysql-test/t/olap.test:
        Manual merge
      mysql-test/t/select.test:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      sql/sql_parse.cc:
        Manual merge
      7f6f31ae
    • unknown's avatar
      Fixed the ucs2 -> eucjpms conversion bug (bug#11717) · 21332fe0
      unknown authored
      
      mysql-test/r/ctype_eucjpms.result:
        Added test for the bug#11717
      mysql-test/t/ctype_eucjpms.test:
        Added test for the bug#11717
      strings/ctype-eucjpms.c:
        Fixed the ucs2 -> eucjpms conversion bug
      21332fe0
    • unknown's avatar
      Fix BUILD/autorun.sh to really bail out on error. · c6825704
      unknown authored
      
      BUILD/autorun.sh:
        Make exit on error actually work.
      c6825704
    • unknown's avatar
      Fixes to previous changeset · f29f6ce1
      unknown authored
      get_defaults_file() -> get_defaults_options()
      
      
      include/my_sys.h:
        Remove deleted function
      libmysql/libmysql.def:
        get_defaults_file() -> get_defaults_options()
      libmysqld/libmysqld.def:
        get_defaults_file() -> get_defaults_options()
      f29f6ce1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5b6c1348
      unknown authored
      into  mishka.local:/home/my/mysql-5.0
      
      
      client/mysqldump.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysys/default.c:
        SCCS merged
      5b6c1348
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · abde46de
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11482
      
      
      abde46de
    • unknown's avatar
      Merge moonbone.local:/work/mysql-4.1-bug-11868 · 3e5cbdbb
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11482
      
      
      mysql-test/r/update.result:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      3e5cbdbb
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 76d1bf38
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      76d1bf38
    • unknown's avatar
      select.test: · 435a1c93
      unknown authored
        Changed test case comment to be more meaningful
      
      
      mysql-test/t/select.test:
        Changed test case comment to be more meaningful
      435a1c93
    • unknown's avatar
      Manual merge · d4b1f6fa
      unknown authored
      
      mysql-test/r/select.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      d4b1f6fa
    • unknown's avatar
      Fix bug#11482 4.1.12 produces different resultset for a complex query · 6b08ac6b
      unknown authored
        than in previous 4.1.x
      
      Wrongly applied optimization were adding NOT NULL constraint which results in
      rejecting valid rows and reduced result set.
      
      The problem was that add_notnull_conds() while checking subquery were adding
      NOT NULL constraint to left joined table, to which, normally, optimization 
      don't have to be applied.
      
      
      sql/sql_select.cc:
        Fix bug #11482 Wrongly applied optimization was erroneously rejecting valid rows
        Constraint were added to optimization appliance test.
      mysql-test/t/select.test:
        Test case for bug #11482  Wrongly applied optimization was erroneously rejecting valid rows
      mysql-test/r/select.result:
        Test case for bug #11482  Wrongly applied optimization was erroneously rejecting valid rows
      6b08ac6b
    • unknown's avatar
      Alleviate the autoconf requirement. · ddc35864
      unknown authored
      ddc35864
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · ffa7e3f1
      unknown authored
      into production.mysql.com:/nfstmp1/guilhem/mysql-4.1-prod
      
      
      ffa7e3f1
    • unknown's avatar
      Fix for BUG#12003 "assertion failure in testsuite (double lock of · 750eedd9
      unknown authored
       LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
      for the size of all binlogs but the current one".
      There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes 
      are very small. Feel free to ask me if you have problems merging them.
      
      
      mysql-test/r/rpl_log.result:
        correcting binlog sizes
      mysql-test/r/rpl_rotate_logs.result:
        correcting binlog sizes
      sql/mysqld.cc:
        don't lock LOCK_thread_count when you already have it
      sql/sql_repl.cc:
        my_open() needs the complete name, not only the base name
      750eedd9
    • unknown's avatar
      Cleanups during review · 68b4d7b7
      unknown authored
      Changed defaults option --instance to --defaults-group-suffix
      Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
      Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
      mysql_print_defaults now understands --defaults-group-suffix
      Remove usage of my_tempnam() (not safe function)
      if( -> if ( and while( to while (
      
      
      BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f:
        Delete: mysys/my_tempnam.c
      VC++Files/client/mysqlclient.dsp:
        Remove not used file my_tempnam.c
      VC++Files/client/mysqlclient_ia64.dsp:
        Remove not used file my_tempnam.c
      VC++Files/libmysql/libmysql.dsp:
        Remove not used file my_tempnam.c
      VC++Files/libmysql/libmysql_ia64.dsp:
        Remove not used file my_tempnam.c
      VC++Files/mysys/mysys.dsp:
        Remove not used file my_tempnam.c
      VC++Files/mysys/mysys_ia64.dsp:
        Remove not used file my_tempnam.c
      client/mysql.cc:
        Change to use get_defaults_options()
        Remove compiler warnings
      client/mysqldump.c:
        Indentation fixes
        Use quoted table name for 'primary_key_fields'
      extra/my_print_defaults.c:
        Add support for --defaults-group-suffix
        change to use get_default_options()
      extra/replace.c:
        Replace my_tempnam() with create_tmp_file() to allow us to remove my_tempnam.c
      include/config-win.h:
        Added DEFAULT_GROUP_SUFFIX_ENV
      include/my_sys.h:
        Change defaults_instance -> defaults_group_suffix
        Change get_defaults_files -> get_defaults_options
      libmysql/Makefile.shared:
        Added DEFAULT_GROUP_SUFFIX_ENV
      mysys/Makefile.am:
        Added DEFAULT_GROUP_SUFFIX_ENV
        Remove my_tempnam.c
      mysys/default.c:
        Changed --instance to --defaults-group-suffix
        Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX and moved the name to Makefile.am
        (mysys shouldn't by MySQL independent)
        Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
      mysys/default_modify.c:
        Optimized code to use allocated space more efficently
        Reduce code size
        Ensure that realloc() works independent of argument size
      mysys/my_bitmap.c:
        Added missing return
      sql/ha_innodb.cc:
        Change if( -> if (
      sql/ha_ndbcluster.cc:
        Change while( -> while (
      sql/item_cmpfunc.cc:
        Break loop early (simple optimization)
      sql/item_strfunc.cc:
        Change if( -> if (
      sql/log.cc:
        Fixed comment
      sql/mysqld.cc:
        Change if( -> if (
      sql/opt_range.cc:
        while( -> while (
        if( -> if (
      sql/parse_file.cc:
        Change if( -> if (
      sql/sql_cache.cc:
        while( -> while (
      sql/sql_parse.cc:
        Change if( -> if (
      sql/sql_prepare.cc:
        Added comment
      sql/sql_select.cc:
        while( -> while (
        Removed index variable by incrementing pointer
      sql/sql_show.cc:
        Change if( -> if (
      sql/sql_yacc.yy:
        Change if( -> if (
      tests/mysql_client_test.c:
        Added cast to first argument to bzero()
      68b4d7b7
    • unknown's avatar
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3ee08038
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      3ee08038
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · ee686641
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      ee686641
  4. 17 Jul, 2005 5 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0d0aa7a4
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-5.0
      
      
      0d0aa7a4
    • unknown's avatar
      select.result, select.test: · 6a88fa48
      unknown authored
        Added a test case for bug #11745.
      sql_select.cc:
        Fixed bug # 11745.
        Added support of where clause for queries with FROM DUAL.
      sql_yacc.yy:
        Fixed bug # 11745.
        Added optional where clause for queries with FROM DUAL.
      
      
      sql/sql_yacc.yy:
        Fixed bug # 11745.
        Added optional where clause for queries with FROM DUAL.
      sql/sql_select.cc:
        Fixed bug # 11745.
        Added support of where clause for queries with FROM DUAL.
      mysql-test/t/select.test:
        Added a test case for bug #11745.
      mysql-test/r/select.result:
        Added a test case for bug #11745.
      6a88fa48
    • unknown's avatar
      Federated Storage Engine, bug 9925 "Federated query processor (step 2 or step 3) not using logic in · 6771f8d0
      unknown authored
      WHERE statement"
      
      
      sql/ha_federated.cc:
        Changes per Jimw's review. 
        
        notes about some suggestions:
        
        1. Tried to replace my_sprintf with strxmov, but had problems. Couldn't 
           get the test suite to run at all, and could not find any particular
           error. Since this is something that is not critical, I'll leave it
           as is for now.
        2. I would like to use my_error to create all of my error messages, but 
           cannot figure out how to get it to take more than one argument to be
           passed to the error message (I tried this once but had errors, and 
           cannot find an example of how to get it to work despite seeing messages
           with obviously more than one arg
        3. Replaced all string building from literals to defined SQL string pieces
           such as "SELECT ", "FROM " ...
        4. Format fixes, spacing fixes completed
        5. Removed records_in_range records calculation functionality
      sql/ha_federated.h:
        Formatting changes, new defines for SQL query string tokens
      sql/share/errmsg.txt:
        changed 'SRC' to 'SOURCE' per Jimw's review
      6771f8d0
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 89519b67
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      89519b67
    • unknown's avatar
      func_in.result, func_in.test: · e155a0c0
      unknown authored
        Fixed bug #11885.
      sql_select.cc:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      sql_yacc.yy:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now 
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      
      
      sql/sql_yacc.yy:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v) now 
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      sql/sql_select.cc:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v) now
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      mysql-test/t/func_in.test:
        Fixed bug #11885.
      mysql-test/r/func_in.result:
        Fixed bug #11885.
      e155a0c0