1. 21 Jun, 2004 1 commit
    • unknown's avatar
      After merge fixes · 0c0b2bae
      unknown authored
      Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
      
      
      client/mysqltest.c:
        Added MAX_VAR_NAME which was lost in merge
        Added more debugging
        Fixed bug in 'eval'
      innobase/data/data0type.c:
        After merge fix
      innobase/fil/fil0fil.c:
        After merge fix
      innobase/log/log0recv.c:
        After merge fix
      myisam/mi_unique.c:
        Better checksum handling
      mysql-test/r/func_time.result:
        Return NULL if a time argument is given to date_add()
      mysql-test/r/rpl_free_items.result:
        After merge fix
      mysql-test/r/rpl_get_lock.result:
        Test was depending on when server was restarted.
      mysql-test/r/type_date.result:
        After merge fix
      mysql-test/r/type_decimal.result:
        After merge fix
      mysql-test/t/func_time.test:
        Removed comment that is not needed anymore
        (After Dimitri's timezone patch is pushed, we should get a warning for the date_add(time...) entry)
      mysql-test/t/rpl_get_lock.test:
        Test was depending on when server was restarted.
      mysql-test/t/type_date.test:
        Addded missing explanation for bug
      netware/mysqld_safe.c:
        Removed end \r
        Run program through indent-ex to get MySQL indentation
      sql-common/client.c:
        After merge fix
      sql/field.cc:
        Fixed that get_date(time) gives a warning
      sql/field.h:
        After merge fix
      sql/net_serv.cc:
        More debugging (if DEBUG_DATA_PACKETS is set)
      sql/sql_class.cc:
        Removed compiler warning
      sql/table.cc:
        Better comment
      0c0b2bae
  2. 18 Jun, 2004 5 commits
    • unknown's avatar
      Merge with 4.0.21 · c18d8473
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Build-tools/mysql-copyright-2:
        Auto merged
      include/violite.h:
        Auto merged
      innobase/btr/btr0btr.c:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/buf/buf0flu.c:
        Auto merged
      innobase/buf/buf0lru.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/dict/dict0mem.c:
        Auto merged
      innobase/fsp/fsp0fsp.c:
        Auto merged
      innobase/fut/fut0lst.c:
        Auto merged
      innobase/ha/hash0hash.c:
        Auto merged
      innobase/include/buf0buf.ic:
        Auto merged
      innobase/include/buf0lru.h:
        Auto merged
      innobase/include/data0data.h:
        Auto merged
      innobase/include/dict0dict.h:
        Auto merged
      innobase/include/dict0mem.h:
        Auto merged
      innobase/include/fsp0fsp.h:
        Auto merged
      innobase/include/hash0hash.h:
        Auto merged
      innobase/include/lock0lock.h:
        Auto merged
      innobase/include/log0log.h:
        Auto merged
      innobase/include/log0log.ic:
        Auto merged
      innobase/include/mem0dbg.ic:
        Auto merged
      innobase/include/mem0pool.h:
        Auto merged
      innobase/include/mtr0mtr.h:
        Auto merged
      innobase/include/sync0rw.h:
        Auto merged
      innobase/include/sync0sync.h:
        Auto merged
      innobase/include/trx0roll.h:
        Auto merged
      innobase/include/trx0trx.h:
        Auto merged
      innobase/include/ut0mem.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/log/log0log.c:
        Auto merged
      innobase/mem/mem0dbg.c:
        Auto merged
      innobase/mem/mem0pool.c:
        Auto merged
      innobase/mtr/mtr0mtr.c:
        Auto merged
      innobase/pars/lexyy.c:
        Auto merged
      innobase/pars/pars0opt.c:
        Auto merged
      innobase/que/que0que.c:
        Auto merged
      innobase/rem/rem0cmp.c:
        Auto merged
      innobase/row/row0ins.c:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      innobase/row/row0upd.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      innobase/sync/sync0rw.c:
        Auto merged
      innobase/sync/sync0sync.c:
        Auto merged
      innobase/thr/thr0loc.c:
        Auto merged
      innobase/trx/trx0purge.c:
        Auto merged
      innobase/trx/trx0roll.c:
        Auto merged
      innobase/trx/trx0sys.c:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      innobase/usr/usr0sess.c:
        Auto merged
      innobase/ut/ut0mem.c:
        Auto merged
      mysql-test/r/func_if.result:
        Auto merged
      mysql-test/r/type_date.result:
        Auto merged
      mysql-test/t/type_date.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      mysys/mf_tempfile.c:
        Auto merged
      netware/BUILD/nwbootstrap:
        Auto merged
      netware/Makefile.am:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/t/func_if.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      support-files/my-innodb-heavy-4G.cnf.sh:
        Auto merged
      Build-tools/Do-compile:
        Merge with 4.0
      Build-tools/mysql-copyright:
        Merge with 4.0
      client/mysqltest.c:
        Merge with 4.0
      include/my_global.h:
        Merge with 4.0
      innobase/buf/buf0rea.c:
        Merge with 4.0
      innobase/data/data0type.c:
        Merge with 4.0
      innobase/ibuf/ibuf0ibuf.c:
        Merge with 4.0
      innobase/include/buf0buf.h:
        Merge with 4.0
      innobase/include/data0type.h:
        Merge with 4.0
      innobase/include/mem0mem.h:
        Merge with 4.0
      innobase/include/mem0mem.ic:
        Merge with 4.0
      innobase/log/log0recv.c:
        Merge with 4.0
      libmysql/libmysql.c:
        Merge with 4.0
      libmysqld/Makefile.am:
        Merge with 4.0
      mysql-test/r/range.result:
        Merge with 4.0
      mysql-test/r/type_decimal.result:
        Merge with 4.0
      mysql-test/t/range.test:
        Merge with 4.0
      netware/BUILD/mwenv:
        Merge with 4.0
      netware/mysql_test_run.c:
        Merge with 4.0
      scripts/mysql_install_db.sh:
        Merge with 4.0
      sql/field.cc:
        Merge with 4.0
      sql/field.h:
        Merge with 4.0
      sql/item_cmpfunc.h:
        Merge with 4.0
      support-files/my-huge.cnf.sh:
        Merge with 4.0
      support-files/my-large.cnf.sh:
        Merge with 4.0
      support-files/my-medium.cnf.sh:
        Merge with 4.0
      support-files/my-small.cnf.sh:
        Merge with 4.0
      support-files/mysql.spec.sh:
        Merge with 4.0
      c18d8473
    • unknown's avatar
      ke it possible to use mysys functions in netware/mysql_test_run.c · 150cef15
      unknown authored
      Don't pass --user to mysqld if --user is not used
      
      
      netware/Makefile.am:
        Make it possible to use mysys functions in mysql_test_run.c
      netware/mysql_test_run.c:
        Make it possible to use mysys functions in mysql_test_run.c
      scripts/mysql_install_db.sh:
        Don't pass --user to mysqld if --user is not used
      150cef15
    • unknown's avatar
      Removed not used file sql_olap.cc · 511557c1
      unknown authored
      511557c1
    • unknown's avatar
      Applied patch from Novell (2004-06-03) · 9e336b70
      unknown authored
      9e336b70
    • unknown's avatar
      Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173) · 9fa13ebe
      unknown authored
      Fixed problem with NULL and derived tables (Bug #4097)
      Cleanup of new pushed code
      
      
      BitKeeper/etc/ignore:
        added mysql-test/ndb/ndbcluster
      client/mysqltest.c:
        simple cleanup
      innobase/os/os0file.c:
        fix for netware
      libmysql/libmysql.c:
        Fixed some byte order bugs with prepared statements on machines with
        high-byte-first. (Bug #4173)
      myisam/ft_boolean_search.c:
        Comment cleanup
      myisam/mi_check.c:
        Removed not needed check (check is done in check_index())
      myisam/mi_unique.c:
        crc must be of type ha_checksum.
      myisam/myisamchk.c:
        Portability fix.
      mysql-test/mysql-test-run.sh:
        Simple cleanup
      mysql-test/r/subselect.result:
        Test problem with NULL and derived tables (Bug #4097)
      mysql-test/t/subselect.test:
        Test problem with NULL and derived tables (Bug #4097)
      sql/mysqld.cc:
        Remove not used defines
      sql/sql_select.cc:
        Fixed problem with NULL and derived tables (Bug #4097)
        Indentation fixes
      sql/sql_string.cc:
        Code cleanup
      sql/sql_yacc.yy:
        Allow one to use DROP PREPARE ...
      9fa13ebe
  3. 17 Jun, 2004 19 commits
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 · c333cce7
      unknown authored
      
      libmysql/libmysql.c:
        Auto merged
      c333cce7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 58b01814
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      58b01814
    • unknown's avatar
      Fixed unlikely bug in the range optimzer when using many IN() queries on... · 91768536
      unknown authored
      Fixed unlikely bug in the range optimzer when using many IN() queries on different key parts. (Bug #4157)
      
      
      mysql-test/r/range.result:
        Test of range optimizer bug
      mysql-test/t/range.test:
        Test of range optimizer bug
      sql/opt_range.cc:
        Fixed unlikely bug in the range optimzer when using many IN() queries on
        different key parts. (Bug #4157)
      91768536
    • unknown's avatar
      mem0dbg.h, mem0dbg.c: · d052e3ab
      unknown authored
        Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
      
      
      innobase/mem/mem0dbg.c:
        Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
      innobase/include/mem0dbg.h:
        Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
      d052e3ab
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23 · e9a759b5
      unknown authored
      into mysql.com:/home/mysql_src/mysql-3.23
      
      
      libmysql/libmysql.c:
        Auto merged
      e9a759b5
    • unknown's avatar
      Fix for BUG#4017 "mysql_real_connect buffer overflow" · 8d59135c
      unknown authored
      
      libmysql/libmysql.c:
        safety fix
      8d59135c
    • unknown's avatar
      que0que.c, srv0que.c: · 7ee664b1
      unknown authored
        Put asserts that make sure srv_que_task_enqueue() is never called under MySQL
      
      
      innobase/srv/srv0que.c:
        Put asserts that make sure srv_que_task_enqueu() is never called under MySQL
      innobase/que/que0que.c:
        Put asserts that make sure srv_que_task_enqueu() is never called under MySQL
      7ee664b1
    • unknown's avatar
      log0recv.c: · b959865a
      unknown authored
        Revert the patch that put log debug code behind UNIV_LOG_DEBUG
      
      
      innobase/log/log0recv.c:
        Revert the patch that put log debug code behind UNIV_LOG_DEBUG
      b959865a
    • unknown's avatar
      log0log.h: · 7228af67
      unknown authored
        Revert the patch that put log debug code behind UNIV_LOG_DEBUG
      log0log.ic, log0recv.c, log0log.c, log0log.h:
        Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
      
      
      innobase/log/log0log.c:
        Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
      innobase/log/log0recv.c:
        Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
      innobase/include/log0log.ic:
        Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
      innobase/include/log0log.h:
        Revert the patch that put log debug code behind UNIV_LOG_DEBUG
      7228af67
    • unknown's avatar
      Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386 · f794626f
      unknown authored
      
      innobase/include/que0que.h:
        Exclude
      innobase/include/que0que.ic:
        Exclude
      innobase/que/que0que.c:
        Exclude
      f794626f
    • unknown's avatar
      Merge heikki@build.mysql.com:/home/bk/mysql-4.0 · 7f8f5743
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.0
      
      7f8f5743
    • unknown's avatar
    • unknown's avatar
      Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 · 321e86a6
      unknown authored
      
      innobase/trx/trx0sys.c:
        Remove #ifdef UNIV_HOT_BACKUP: best to keep the codebase as uniform as possible
      innobase/dict/dict0dict.c:
        Exclude
      innobase/dict/dict0mem.c:
        Exclude
      innobase/ha/hash0hash.c:
        Exclude
      innobase/include/data0data.h:
        Exclude
      innobase/include/dict0mem.h:
        Exclude
      innobase/include/hash0hash.h:
        Exclude
      innobase/include/hash0hash.ic:
        Exclude
      innobase/include/mtr0mtr.h:
        Exclude
      innobase/include/row0ins.h:
        Exclude
      innobase/include/row0upd.h:
        Exclude
      innobase/row/row0ins.c:
        Exclude
      innobase/row/row0upd.c:
        Exclude
      innobase/thr/thr0loc.c:
        Exclude
      321e86a6
    • unknown's avatar
      Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040526164114|35829 · 7dda1dde
      unknown authored
      
      innobase/que/que0que.c:
        Exclude
      7dda1dde
    • unknown's avatar
      srv0que.c: · 948d33fa
      unknown authored
        Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs
      srv0que.c, srv0que.h:
        new file
      
      
      innobase/srv/srv0que.c:
        Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs
      948d33fa
    • unknown's avatar
      Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 · c5482bcd
      unknown authored
      
      BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
        Exclude
      BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
        Exclude
      innobase/include/que0que.h:
        Exclude
      innobase/include/trx0roll.h:
        Exclude
      innobase/include/trx0trx.h:
        Exclude
      innobase/include/usr0sess.h:
        Exclude
      innobase/que/que0que.c:
        Exclude
      innobase/srv/Makefile.am:
        Exclude
      innobase/include/Makefile.am:
        Exclude
      innobase/srv/srv0srv.c:
        Exclude
      innobase/trx/trx0purge.c:
        Exclude
      innobase/trx/trx0roll.c:
        Exclude
      innobase/trx/trx0trx.c:
        Exclude
      innobase/usr/usr0sess.c:
        Exclude
      c5482bcd
    • unknown's avatar
      No commit message · c4a0dd55
      unknown authored
      No commit message
      c4a0dd55
    • unknown's avatar
      Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20040617084849|64488 · c3ca8a5c
      unknown authored
      
      sql/sql_parse.cc:
        Exclude
      c3ca8a5c
    • unknown's avatar
      Cset exclude: guilhem@mysql.com|ChangeSet|20040609132715|17355 · 41e8e05f
      unknown authored
      
      sql/sql_parse.cc:
        Exclude
      41e8e05f
  4. 16 Jun, 2004 6 commits
    • unknown's avatar
      ut0mem.c: · 941ed735
      unknown authored
        Remove printf's that were accidentally pushed in the last push
      
      
      innobase/ut/ut0mem.c:
        Remove printf's that were accidentally pushed in the last push
      941ed735
    • unknown's avatar
      ut0mem.h, ut0mem.c: · 77379aea
      unknown authored
        Implement ut_realloc
      lexyy.c, pars0lex.l:
        Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
      
      
      innobase/pars/pars0lex.l:
        Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
      innobase/pars/lexyy.c:
        Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
      innobase/ut/ut0mem.c:
        Implement ut_realloc
      innobase/include/ut0mem.h:
        Implement ut_realloc
      77379aea
    • unknown's avatar
      mem0mem.ic, mem0mem.h: · 923e1f5e
      unknown authored
        Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
      
      
      innobase/include/mem0mem.h:
        Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
      innobase/include/mem0mem.ic:
        Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
      923e1f5e
    • unknown's avatar
      InnoDB bug fix: mem_realloc() didn't preserve the block contents · abbecc61
      unknown authored
      
      innobase/include/mem0mem.ic:
        mem_realloc(): preserve the old buffer contents
      abbecc61
    • unknown's avatar
      InnoDB: Revert most of ChangeSet@1.1772, as the debug functions may · 9ed3c760
      unknown authored
      be needed when testing production releases
      
      
      innobase/btr/btr0btr.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/buf/buf0buf.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/buf/buf0flu.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/buf/buf0lru.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/buf/buf0rea.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/data/data0type.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/dict/dict0dict.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/fsp/fsp0fsp.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/fut/fut0lst.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/ibuf/ibuf0ibuf.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/btr0btr.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/buf0buf.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/buf0buf.ic:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/buf0flu.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/buf0lru.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/data0type.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/dict0dict.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/fsp0fsp.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/fut0lst.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/lock0lock.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/mem0dbg.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/mem0dbg.ic:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/mem0pool.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/mtr0mtr.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/pars0opt.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/sync0rw.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/include/sync0sync.h:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/lock/lock0lock.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/mem/mem0dbg.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/mem/mem0pool.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/mtr/mtr0mtr.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/pars/pars0opt.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/srv/srv0start.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/sync/sync0rw.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/sync/sync0sync.c:
        Remove #ifdef UNIV_DEBUG around debug code
      innobase/trx/trx0roll.c:
        Remove #ifdef UNIV_DEBUG around debug code
      9ed3c760
    • unknown's avatar
      mysql-copyright: · 87cc8af1
      unknown authored
        * added 'local $/' to keep from undef-ing $/ (the newline setting) for the whole script
        * removed the target dir removal (target dir is not a temp dir!)
        * use split to create filelist (cleaner way than using chomp!)
        * removed use of chomp because it caused some file names to be mangled
        * print out which file is being processed if verbose
      mysql-copyright-2:
        * added cpp to list of files to be processed (for windows archives)
      
      
      Build-tools/mysql-copyright-2:
        * added cpp to list of files to be processed (for windows archives)
      Build-tools/mysql-copyright:
        * added 'local $/' to keep from undef-ing $/ (the newline setting) for the whole script
        * removed the target dir removal (target dir is not a temp dir!)
        * use split to create filelist (cleaner way than using chomp!)
        * removed use of chomp because it caused some file names to be mangled
        * print out which file is being processed if verbose
      87cc8af1
  5. 15 Jun, 2004 2 commits
    • unknown's avatar
      InnoDB bug fix (row0mysql.c): make reserved table names innodb_* special again · a8773c6d
      unknown authored
      
      innobase/row/row0mysql.c:
        row_create_table_for_mysql(), row_drop_table_for_mysql():
         Make InnoDB recognize the special table names innodb_* again.
      a8773c6d
    • unknown's avatar
      mysql-copyright -> more fixes to deal with problems in removing temporary tar... · ad28efa6
      unknown authored
      mysql-copyright -> more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD).
      Servers.fgl -> made sure all charset files were accounted for (cp 1256 was missing)
      
      
      Build-tools/mysql-copyright:
        more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD).
      VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl:
        made sure all charset files were accounted for (cp 1256 was missing)
      VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl:
        made sure all charset files were accounted for (cp 1256 was missing)
      VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl:
        made sure all charset files were accounted for (cp 1256 was missing)
      ad28efa6
  6. 12 Jun, 2004 4 commits
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · cb404ee7
      unknown authored
      into teton.kitebird.com:/home/paul/bk/mysql-4.1
      
      cb404ee7
    • unknown's avatar
      sql_state.h: · 8544d2f7
      unknown authored
        Fix couple of typos.
      
      
      include/sql_state.h:
        Fix couple of typos.
      8544d2f7
    • unknown's avatar
      Unicode collation algorithm: contraction support. · 11d7e79f
      unknown authored
      E.g. 'Ch' is treated as a separate letter in Czech,
      not as a combination of C+h.
      
      11d7e79f
    • unknown's avatar
      mysql-copyright: · bb66cb34
      unknown authored
        Fixed various issues to deal with untarring of gpl tar file, clearing configure.in, changed calls to use system vs. backticks
      
      
      Build-tools/mysql-copyright:
        Fixed various issues to deal with untarring of gpl tar file, clearing configure.in, changed calls to use system vs. backticks
      bb66cb34
  7. 11 Jun, 2004 3 commits
    • unknown's avatar
      after merge fix · adb1c271
      unknown authored
      adb1c271
    • unknown's avatar
      after merge fix · 6b5907e2
      unknown authored
      
      myisam/mi_unique.c:
        warning removed
      6b5907e2
    • unknown's avatar
      merged · fae2a87f
      unknown authored
      
      acinclude.m4:
        Auto merged
      include/m_ctype.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-czech.c:
        Auto merged
      strings/ctype-gbk.c:
        Auto merged
      strings/ctype-latin1.c:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      strings/ctype-tis620.c:
        Auto merged
      strings/ctype-uca.c:
        Auto merged
      strings/ctype-utf8.c:
        Auto merged
      strings/ctype-win1250ch.c:
        Auto merged
      fae2a87f