1. 26 Feb, 2003 16 commits
    • unknown's avatar
      Minor changes from 4.0->4.1 by Novell (Rob Lyon) · 2eab6ae6
      unknown authored
      
      netware/mw/mwenv:
        MW environment for 4.1 (add zlib dir, change path)
      netware/nwconfigure:
        with-extra-charsets changed to latin1_de
      sql/mysqld.cc:
        Removed duplicate call to pthread_exit(0)
      2eab6ae6
    • unknown's avatar
      All segments of SPATIAL keys MUST be NOT NULL. · 9b7ebb92
      unknown authored
      Allow NULL geometry fields.
      
      
      include/mysqld_error.h:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/czech/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/danish/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/dutch/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/english/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/estonian/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/french/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/german/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/greek/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/hungarian/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/italian/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/japanese/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/korean/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/norwegian-ny/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/norwegian/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/polish/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/portuguese/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/romanian/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/russian/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/serbian/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/slovak/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/spanish/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/swedish/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      sql/share/ukrainian/errmsg.txt:
        new error message: "All parts of a SPATIAL KEY must be NOT NULL"
      9b7ebb92
    • unknown's avatar
      Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 29a99fa0
      unknown authored
      into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
      
      
      sql/spatial.cc:
        Auto merged
      29a99fa0
    • unknown's avatar
    • unknown's avatar
      sql_yacc.yy, lex.h: · e0100ed8
      unknown authored
        SET NAMES is now working
      
      
      sql/lex.h:
        SET NAMES is now working
      sql/sql_yacc.yy:
        SET NAMES is now working
      e0100ed8
    • unknown's avatar
      set_var.cc, set_var.h: · 61bd8556
      unknown authored
        New thread variable client_character_set
      
      
      sql/set_var.h:
        New thread variable client_character_set
      sql/set_var.cc:
        New thread variable client_character_set
      61bd8556
    • unknown's avatar
      sql_show.cc: · 2667f61b
      unknown authored
        Less default_charset_info
      
      
      sql/sql_show.cc:
        Less default_charset_info
      2667f61b
    • unknown's avatar
      sql_class.h: · 605ddceb
      unknown authored
        New method to simplify access to thd charset
      
      
      sql/sql_class.h:
        New method to simplify access to thd charset
      605ddceb
    • unknown's avatar
      sql_test.cc: · 3ba2916b
      unknown authored
        Less default_charset_info
      
      
      sql/sql_test.cc:
        Less default_charset_info
      3ba2916b
    • unknown's avatar
      sql_udf.cc, protocol.cc: · 5bc80ff8
      unknown authored
        Less default_charset_info
      
      
      sql/protocol.cc:
        Less default_charset_info
      sql/sql_udf.cc:
        Less default_charset_info
      5bc80ff8
    • unknown's avatar
      set_var.cc, sql_table.cc, handler.cc, field.cc: · 6d535030
      unknown authored
        Less default_charset_info
      
      
      sql/field.cc:
        Less default_charset_info
      sql/handler.cc:
        Less default_charset_info
      sql/sql_table.cc:
        Less default_charset_info
      sql/set_var.cc:
        Less default_charset_info
      6d535030
    • unknown's avatar
      sql_analyse.cc, spatial.cc: · 8a7d862c
      unknown authored
        Some default_charset_info were removed
      sql_select.cc:
        Some default_charset_info were removed.
      
      
      sql/spatial.cc:
        Some default_charset_info were removed
      sql/sql_select.cc:
        Some default_charset_info were removed.
      sql/sql_analyse.cc:
        Some default_charset_info were removed
      8a7d862c
    • unknown's avatar
      item_func.cc: · 12749eaf
      unknown authored
        Some reoganization
        Fixed that binary arguments do not affect result charset
        anymore
        For example, the second argument doesn't affect charset of result in LEFT(string,10)
      sql_string.h:
        Strings are binary by default now
      
      
      sql/sql_string.h:
        Strings are binary by default now
      sql/item_func.cc:
        Some reoganization
        Fixed that binary arguments do not affect result charset
        anymore
        For example, the second argument doesn't affect charset of result in LEFT(string,10)
      12749eaf
    • unknown's avatar
      item_sum.cc: · 99effd31
      unknown authored
        Fixed that MIN() didn't return proper charset for CREATE from SELECT
      
      
      sql/item_sum.cc:
        Fixed that MIN() didn't return proper charset for CREATE from SELECT
      99effd31
    • unknown's avatar
      Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · e618de17
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      
      e618de17
    • unknown's avatar
      33c8d992
  2. 25 Feb, 2003 21 commits
    • unknown's avatar
      Merge with 4.0.11 · a7e3ba1d
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BUILD/FINISH.sh:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/my_base.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      innobase/ut/ut0mem.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/bigint.result:
        Auto merged
      mysql-test/r/handler.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/innodb_handler.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/bigint.test:
        Auto merged
      mysql-test/t/handler.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/innodb_handler.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      sql/table.h:
        Auto merged
      a7e3ba1d
    • unknown's avatar
      bebafeba
    • unknown's avatar
      merge with 3.23 to get corrected error message files and rename of files in mysql-test · b9c69c16
      unknown authored
      
      innobase/ibuf/ibuf0ibuf.c:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/sql_analyse.h:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      mysql-test/t/rpl000015.slave-mi:
        Auto merged
      mysql-test/t/rpl_rotate_logs.slave-mi:
        Auto merged
      mysql-test/mysql-test-run.sh:
        merge with 3.23
      scripts/make_binary_distribution.sh:
        merge with 3.23
      sql/share/czech/errmsg.txt:
        merge with 3.23
      sql/share/danish/errmsg.txt:
        merge with 3.23
      sql/share/dutch/errmsg.txt:
        merge with 3.23
      sql/share/estonian/errmsg.txt:
        merge with 3.23
      sql/share/swedish/errmsg.txt:
        merge with 3.23
      sql/sql_class.cc:
        merge with 3.23 (Keep local copy)
      b9c69c16
    • unknown's avatar
      Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS) · 6e2ee187
      unknown authored
      
      mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
        Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt
      mysql-test/t/rpl000015-slave-master-info.opt:
        Rename: mysql-test/t/rpl000015.slave-mi -> mysql-test/t/rpl000015-slave-master-info.opt
      mysql-test/r/bigint.result:
        New bigint test
      mysql-test/t/bigint.test:
        New bigint test
      netware/mysql_test_run.c:
        slave-master-info.opt -> .slave-mi
      6e2ee187
    • unknown's avatar
      change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS · 21f2382b
      unknown authored
      
      mysql-test/t/rpl_rotate_logs.slave-mi:
        Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi
      mysql-test/t/rpl000015.slave-mi:
        Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi
      21f2382b
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · e0ba590f
      unknown authored
      into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
      
      
      e0ba590f
    • unknown's avatar
      fixed again · 49ecdaec
      unknown authored
      49ecdaec
    • unknown's avatar
      Portability fix · 0a1af051
      unknown authored
      0a1af051
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 01664260
      unknown authored
      into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
      
      
      01664260
    • unknown's avatar
      Ignore some automaticly generated files · 01e32fd0
      unknown authored
      
      BitKeeper/etc/ignore:
        added support-files/MacOSX/StartupParameters.plist support-files/MacOSX/postinstall support-files/MacOSX/preinstall
      01e32fd0
    • unknown's avatar
      Portability fix for HPUX10.20 · a54c17ce
      unknown authored
      
      BUILD/compile-pentium-debug-max:
        Added -DBIG_TABLES
      sql/mysqld.cc:
        Simple code cleanup
      a54c17ce
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 1f4fed8a
      unknown authored
      into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
      
      
      1f4fed8a
    • unknown's avatar
      fix a bug in the test · 11139d6f
      unknown authored
      11139d6f
    • unknown's avatar
    • unknown's avatar
      - Heavily reworked the Do-pkg script to use functions from logger.pm · baa0238c
      unknown authored
       - moved helper functions from Bootstrap script to logger.pm 
      
      
      Build-tools/Bootstrap:
         - renamed logfile -> LOGFILE
         - moved functions abort() and run_command() to logger.pm for better
           reusability
      Build-tools/Do-pkg:
         - heavily reworked: now make use of the logger.pm helper functions
         - added new options: --dry-run, --log, --mail, --verbose
      Build-tools/logger.pm:
         - added functions run_command() and abort() from Bootstrap script for
           better code reusability
      support-files/MacOSX/postinstall.sh:
         - made script more robust
      baa0238c
    • unknown's avatar
      - bumped up version number from 4.0.11-gamma -> 4.0.12-gamma in configure.in · c7c6abee
      unknown authored
       - tagged ChangeSet 1.1594 as "mysql-4.0.11"
      
      
      c7c6abee
    • unknown's avatar
      Fixed "syntax" errors in text message files. · 0d3b0c39
      unknown authored
      Ensured that all errors messages ends with: ",
      
      
      sql/share/czech/errmsg.txt:
        Fixed new line terminations
      sql/share/danish/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/dutch/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/english/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/estonian/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/french/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/german/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/greek/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/hungarian/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/italian/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/japanese/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/korean/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/norwegian-ny/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/norwegian/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/polish/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/portuguese/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/romanian/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/russian/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/slovak/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/spanish/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/swedish/errmsg.txt:
        Fixed "syntax" errors.
      sql/share/ukrainian/errmsg.txt:
        Fixed "syntax" errors.
      0d3b0c39
    • unknown's avatar
      Indentation cleanup · cf417ede
      unknown authored
      cf417ede
    • unknown's avatar
      Forbid NULL geometry fields · 829af501
      unknown authored
      829af501
    • unknown's avatar
      Fix for the prepared statement access checks · 6957a85c
      unknown authored
      6957a85c
    • unknown's avatar
      1. Fix for the crash in debug mode when the .frm is corrupted and SHOW TABLE... · cf00101b
      unknown authored
      1. Fix for the crash in debug mode when the .frm is corrupted and SHOW TABLE STATUS is executed.This also fixes to return the error message to comment field in SHOW TABLE STATUS when the .frm is corrupted
      2. Test for corrupted .frm and the SHOW TABLE STATUS
      
      
      sql/sql_show.cc:
        Fix for the crash in debug mode when the .frm is corrupted and SHOW TABLE STATUS is executed
        This also fixes to return the error message to comment field in SHOW TABLE STATUS when the .frm is corrupted
      tests/client_test.c:
        test for corrupted .frm and the SHOW TABLE STATUS
      cf00101b
  3. 24 Feb, 2003 3 commits