1. 07 Nov, 2005 1 commit
    • unknown's avatar
      latin1.xml: · 3710ef16
      unknown authored
        Fixing latin1 to cp1252, according to
        recent changes in ctype-latin1.c.
      Index.xml:
        Marking latin1_swedish_ci as "compiled"
        to avoid its generating into ctype-extra.c.
      ctype-extra.c:
        Bug#12076 --with-extra-charsets has no effect
        All supported dnamic charsets were generated
        from sql/share/charsets/*.xml under #ifdefs.
        Compiling is to be activated from "configure"
        by adding --with-extra-charsets.
        I'm not including auto-recreating of ctype-extra.c
        into build process for ease purposes.
      
      
      strings/ctype-extra.c:
        Bug#12076 --with-extra-charsets has no effect
        All supported dnamic charsets were generated
        from sql/share/charsets/*.xml under #ifdefs.
        Compiling is to be activated from "configure"
        by adding --with-extra-charsets.
        I'm not including auto-recreating of ctype-extra.c
        into build process for ease purposes.
      sql/share/charsets/Index.xml:
        Marking latin1_swedish_ci as "compiled"
        to avoid its generating into ctype-extra.c.
      sql/share/charsets/latin1.xml:
        Fixing latin1 to cp1252, according to
        recent changes in ctype-latin1.c.
      3710ef16
  2. 03 Nov, 2005 1 commit
  3. 01 Nov, 2005 6 commits
  4. 31 Oct, 2005 5 commits
  5. 29 Oct, 2005 4 commits
  6. 28 Oct, 2005 8 commits
  7. 27 Oct, 2005 13 commits
    • unknown's avatar
      Fix bug#14186 select datefield is null not updated · 6020281e
      unknown authored
      Date field was declared as not null, thus expression 'datefield is null'
      was always false. For SELECT special handling of such cases is used. 
      There 'datefield is null' converted to 'datefield eq "0000-00-00"'.
      
      In mysql_update() before creation of select added remove_eq_conds() call.
      It makes some optimization of conds and in particular performs conversion
      from 'is null' to 'eq'. 
      Also remove_eq_conds() makes some evaluation of conds and if it founds that
      conds is always false then update statement is not processed further.
      All this allows to perform some update statements process faster due to
      optimized conds, and not wasting resources if conds known to be false. 
      
      
      sql/sql_select.cc:
        Fix bug#14186  select datefield is null not updated
        Remove static from remove_eq_conds()
      sql/sql_select.h:
         Fix bug#14186  select datefield is null not updated
        Added remove_eq_conds() prototype.
      mysql-test/r/update.result:
        Test case for  bug#14186  select datefield is null not updated
      mysql-test/t/update.test:
        Test case for  bug#14186  select datefield is null not updated
      sql/sql_update.cc:
        Fix bug#14186  select datefield is null not updated
        To mysql_update() added call to remove_eq_conds() to optimize conds and convert 'datefield is null' to 'datefield eq 0000-00-00'
      6020281e
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-14009 · 5e8515d9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/item_func.cc:
        Auto merged
      5e8515d9
    • unknown's avatar
      Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0 · 62359c2d
      unknown authored
      into mysql.com:/data0/mysqldev/lenz/mysql-4.1
      
      
      netware/BUILD/compile-linux-tools:
        Auto merged
      62359c2d
    • unknown's avatar
      - cleanup: removed the empty NEW-RPMS directory and all references · ac22cdc5
      unknown authored
       - cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
         script (we now use Do-pkg for building OS X packages)
      
      
      BitKeeper/deleted/.del-.cvsignore~4c7a1f88a5a62a24:
        Delete: NEW-RPMS/.cvsignore
      BitKeeper/deleted/.del-make_mysql_pkg.pl~caac82eb901cc206:
        Delete: support-files/MacOSX/make_mysql_pkg.pl
      netware/BUILD/compile-linux-tools:
         - removed reference to the NEW-RPMS directory
      netware/BUILD/compile-netware-END:
         - removed reference to the NEW-RPMS directory
      netware/BUILD/compile-netware-src:
         - removed reference to the NEW-RPMS directory
      ac22cdc5
    • unknown's avatar
      - after merge fixes · ae60d9dd
      unknown authored
      
      configure.in:
        Auto merged
      support-files/mysql.spec.sh:
         - after-merge fix
      ae60d9dd
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 987c33a9
      unknown authored
      into moonbone.local:/work/13855-bug-4.1-mysql
      
      
      987c33a9
    • unknown's avatar
      select.result: · fb94ffda
      unknown authored
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      fb94ffda
    • unknown's avatar
      Manually merged · 111b40e1
      unknown authored
      
      include/config-netware.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/select.result:
        Manually merged fix for bug#13855
      mysql-test/t/select.test:
        Manuall merged fix for bug#13855
      111b40e1
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · e28a02ec
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-4.1-innobase
      
      
      e28a02ec
    • unknown's avatar
      - Removed obsolete and outdated man page files from the man · 0ffe070c
      unknown authored
         directory - these files are now maintained in the mysqldoc
         repository and included in the source distribution during the
         release build. Updated the configure.in script and Makefiles to
         create the man page file list at build time
       - Updated the file list in the RPM spec file to include all currently
         available man pages (this can not be done with wildcards, as
         the man pages are spread across several subpackages. However, RPM
         warns about unpackaged files, so newly added man pages can be 
         spotted)
      
      
      BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
        Delete: man/isamchk.1.in
      BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
        Delete: man/isamlog.1.in
      BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a:
        Delete: man/mysql.1.in
      BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf:
        Delete: man/mysqlaccess.1.in
      BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769:
        Delete: man/mysqladmin.1.in
      BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c:
        Delete: man/mysqld.1.in
      BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6:
        Delete: man/mysqld_multi.1.in
      BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b:
        Delete: man/mysqld_safe.1.in
      BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5:
        Delete: man/mysqldump.1.in
      BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325:
        Delete: man/mysql_fix_privilege_tables.1.in
      BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624:
        Delete: man/mysql_zap.1.in
      BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f:
        Delete: man/mysqlshow.1.in
      BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c:
        Delete: man/perror.1.in
      BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c:
        Delete: man/replace.1.in
      configure.in:
         - dynamically add man pages included in the man directory
           (the BK tree only contains one dummy file, the directory is
           populated by the Bootstrap script by copying current man pages
           from the documentation server)
      man/Makefile.am:
         - removed hard-coded list of man pages, the list is populated
           during the configure stage. When building from BK, only one
           placeholder file exists. For the release builds, this directory
           is populated by the Bootstrap script, which takes man page files
           from the documentation server.
      man/mysqlman.1:
         - removed version number
      support-files/mysql.spec.sh:
         - adjusted file list: added man pages that are now part of the
           official source distribution (taken from the documentation
           server)
      0ffe070c
    • unknown's avatar
      conf_to_src.c: · 4cccc642
      unknown authored
        Dump MY_CS_CSSORT when it's necessary.
      
      
      strings/conf_to_src.c:
        Dump MY_CS_CSSORT when it's necessary.
      4cccc642
    • unknown's avatar
      conf_to_src.c: · fed8b208
      unknown authored
        Updating to conform the current CHARSET_INFO structure.
      
      
      strings/conf_to_src.c:
        Updating to conform the current structure.
      fed8b208
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6ec1c061
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b13347
      
      
      6ec1c061
  8. 26 Oct, 2005 2 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 · fff4e673
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      fff4e673
    • unknown's avatar
      Removed innobase/my_cnf, innobase/include/makefilewin.i, · d1d49ce1
      unknown authored
       and innobase/*/makefilewin (which are unused now).
      
      
      BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
        Delete: innobase/include/makefilewin.i
      BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
        Delete: innobase/btr/makefilewin
      BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
        Delete: innobase/buf/makefilewin
      BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
        Delete: innobase/data/makefilewin
      BitKeeper/deleted/.del-makefilewin~5104767c73775697:
        Delete: innobase/dict/makefilewin
      BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
        Delete: innobase/dyn/makefilewin
      BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
        Delete: innobase/eval/makefilewin
      BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
        Delete: innobase/fil/makefilewin
      BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
        Delete: innobase/fsp/makefilewin
      BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
        Delete: innobase/fut/makefilewin
      BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
        Delete: innobase/ha/makefilewin
      BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
        Delete: innobase/ibuf/makefilewin
      BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
        Delete: innobase/lock/makefilewin
      BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
        Delete: innobase/log/makefilewin
      BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
        Delete: innobase/mach/makefilewin
      BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
        Delete: innobase/mem/makefilewin
      BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
        Delete: innobase/mtr/makefilewin
      BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
        Delete: innobase/os/makefilewin
      BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
        Delete: innobase/page/makefilewin
      BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
        Delete: innobase/pars/makefilewin
      BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
        Delete: innobase/que/makefilewin
      BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
        Delete: innobase/read/makefilewin
      BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
        Delete: innobase/rem/makefilewin
      BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
        Delete: innobase/row/makefilewin
      BitKeeper/deleted/.del-makefilewin~63acd666293282a:
        Delete: innobase/srv/makefilewin
      BitKeeper/deleted/.del-makefilewin~13888739357b3025:
        Delete: innobase/sync/makefilewin
      BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
        Delete: innobase/thr/makefilewin
      BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
        Delete: innobase/trx/makefilewin
      BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
        Delete: innobase/usr/makefilewin
      BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
        Delete: innobase/ut/makefilewin
      BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
        Delete: innobase/makefilewin
      BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
        Delete: innobase/my_cnf
      innobase/include/Makefile.am:
        Removed ref to Makefilewin.i (it is unused now).
      d1d49ce1