ChangeSet
  1.1671 03/03/15 18:42:55 lenz@mysql.com +2 -0
	 - fixed C++-style comments to make IBM C compiler happy

  strings/t_ctype.h
    1.6 03/03/15 18:42:53 lenz@mysql.com +4 -4
     - fixed C++-style comments to make IBM C compiler happy

  client/mysqlshow.c
    1.26 03/03/15 18:42:53 lenz@mysql.com +1 -1
     - fixed C++-style comment to make IBM C compiler happy

ChangeSet
  1.1668.1.1 03/03/14 16:07:15 guilhem@mysql.com +1 -0
  Small fixes in mysql_tableinfo. It's only code tiny changes, does not modify
  the output of the script.

  scripts/mysql_tableinfo.sh
    1.2 03/03/14 16:07:11 guilhem@mysql.com +56 -58
    Small fixes in this program which I contributed some time ago. These fixes
    are waiting in Monty's mailbox since August, and there are tiny :
    * use array{'x'} instead of array{x}
    * use fetchrow_arrayref instead of fetchrow_array
    * try to hide the command-line options from 'ps' like mysqlhotcopy does
    * use 'map' instead of homegrown function
    * use $_ instead of $i when possible

ChangeSet
  1.1669 03/03/14 14:17:56 lenz@mysql.com +1 -0
   - we need to require an installation on the root volume (/usr/local/mysql)

  support-files/MacOSX/Info.plist.sh
    1.2 03/03/14 14:17:18 lenz@mysql.com +1 -1
     - we need to require an installation on the root volume (/usr/local/mysql)

ChangeSet
  1.1668 03/03/13 23:09:25 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

  sql/ha_innodb.cc
    1.160 03/03/13 23:09:16 heikki@hundin.mysql.fi +10 -0
    Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

ChangeSet
  1.1665.1.1 03/03/13 18:51:50 serg@serg.mysql.com +1 -0
  Merge

  sql/filesort.cc
    1.53 03/03/13 18:51:48 serg@serg.mysql.com +0 -0
    SCCS merged

ChangeSet
  1.676.1.682 03/03/13 18:46:40 serg@serg.mysql.com +1 -0
  fix for crash with small sort_buffer

  sql/filesort.cc
    1.30.1.3 03/03/13 18:46:38 serg@serg.mysql.com +5 -0
    fix for crash with small sort_buffer

ChangeSet
  1.1660.1.2 03/03/13 18:16:47 lenz@mysql.com +1 -0
   - added option "--skip-disk-image" and short form "-s" in addition to the
     already existing "--skip-dmg" (per Monty request)
   - Fixed handling of license files

  Build-tools/Do-pkg
    1.4 03/03/13 18:16:45 lenz@mysql.com +9 -7
     - added option "--skip-disk-image" and short form "-s" in addition to the
       already existing "--skip-dmg" (per Monty request)
     - Fixed handling of license files

ChangeSet
  1.1665 03/03/13 17:57:24 serg@serg.mysql.com +3 -0
  merged

  tests/grant.pl
    1.10 03/03/13 17:57:22 serg@serg.mysql.com +1 -5
    merged

  tests/grant.res
    1.8 03/03/13 17:52:54 serg@serg.mysql.com +0 -2
    Auto merged

  sql/sql_base.cc
    1.155 03/03/13 17:52:53 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.1.681 03/03/13 16:43:43 monty@mashka.mysql.fi +3 -0
  Better fix for GRANT bug

  tests/grant.res
    1.3.1.2 03/03/13 16:43:42 monty@mashka.mysql.fi +7 -7
    new test results

  tests/grant.pl
    1.4.1.2 03/03/13 16:43:42 monty@mashka.mysql.fi +33 -22
    More options for test

  sql/sql_base.cc
    1.74.1.30 03/03/13 16:43:42 monty@mashka.mysql.fi +5 -2
    Better fix for GRANT bug

ChangeSet
  1.1663 03/03/13 14:40:13 serg@serg.mysql.com +2 -0
  make test result more obvious

  mysql-test/t/select.test
    1.18 03/03/13 14:40:11 serg@serg.mysql.com +1 -1
    make test result more obvious

  mysql-test/r/select.result
    1.25 03/03/13 14:40:11 serg@serg.mysql.com +2 -1
    make test result more obvious

ChangeSet
  1.1662 03/03/13 14:34:07 serg@serg.mysql.com +3 -0
  test result updated after merge

  mysql-test/r/select.result
    1.24 03/03/13 14:34:04 serg@serg.mysql.com +11 -2
    test result updated after merge

  mysql-test/r/group_by.result
    1.27 03/03/13 14:34:04 serg@serg.mysql.com +5 -0
    test result updated after merge

  mysql-test/r/analyse.result
    1.6 03/03/13 14:34:04 serg@serg.mysql.com +15 -2
    test result updated after merge

ChangeSet
  1.1660.1.1 03/03/13 13:52:15 lenz@mysql.com +1 -0
   - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed with
     "DBUG_RETURN undeclared" on Mac OS X)

  sql/sql_class.cc
    1.101 03/03/13 13:52:14 lenz@mysql.com +1 -1
     - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed with
       "DBUG_RETURN undeclared" on Mac OS X)

ChangeSet
  1.1661 03/03/13 13:44:03 serg@serg.mysql.com +17 -0
  merged

  sql/sql_base.cc
    1.154 03/03/13 13:44:00 serg@serg.mysql.com +0 -4
    merged

  sql/sql_analyse.cc
    1.18 03/03/13 13:44:00 serg@serg.mysql.com +0 -11
    merged

  sql/net_serv.cc
    1.53 03/03/13 13:44:00 serg@serg.mysql.com +0 -1
    merged

  sql/item.h
    1.37 03/03/13 13:44:00 serg@serg.mysql.com +0 -0
    merged

  mysql-test/t/select.test
    1.17 03/03/13 13:44:00 serg@serg.mysql.com +11 -10
    merged

  mysql-test/t/group_by.test
    1.18 03/03/13 13:44:00 serg@serg.mysql.com +2 -1
    merged

  mysql-test/t/analyse.test
    1.5 03/03/13 13:44:00 serg@serg.mysql.com +1 -0
    merged

  mysql-test/r/select.result
    1.23 03/03/13 13:44:00 serg@serg.mysql.com +0 -1
    ul

  mysql-test/r/group_by.result
    1.26 03/03/13 13:44:00 serg@serg.mysql.com +0 -1
    ul

  mysql-test/r/analyse.result
    1.5 03/03/13 13:44:00 serg@serg.mysql.com +0 -12
    ul

  strings/ctype-tis620.c
    1.18 03/03/13 12:42:45 serg@serg.mysql.com +0 -15
    Auto merged

  sql/sql_select.cc
    1.228 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.27 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.120 03/03/13 12:42:44 serg@serg.mysql.com +0 -1
    Auto merged

  sql/gen_lex_hash.cc
    1.57 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.59 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Auto merged

  mysql-test/r/select.result
    1.2.2.2 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Turn off SCCS flag

  man/perror.1
    1.5 03/03/13 12:42:43 serg@serg.mysql.com +0 -0
    Auto merged

  man/perror.1
    1.1.2.2 03/03/13 12:42:43 serg@serg.mysql.com +0 -0
    Change mode to -rw-rw-r--

  scripts/mysqld_safe.sh
    1.39.10.2 03/03/13 12:42:15 serg@serg.mysql.com +0 -0
    Merge rename: scripts/safe_mysqld.sh -> scripts/mysqld_safe.sh

ChangeSet
  1.1660 03/03/13 12:20:29 serg@serg.mysql.com +1 -0
  texinfo syntax cleanup. 4.1 protocol sections are still too broken for this file to be compiled :(

  Docs/internals.texi
    1.24 03/03/13 12:20:27 serg@serg.mysql.com +87 -22
    texinfo syntax cleanup. 4.1 protocol sections are still too broken for this file to be compiled :(

ChangeSet
  1.1659 03/03/13 11:23:34 serg@serg.mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/mysqld.cc
    1.407 03/03/13 11:23:30 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1658 03/03/12 21:35:57 pgulutzan@linux.local +2 -0
  Added PeterG's new internals documenation.

  BitKeeper/etc/logging_ok
    1.276 03/03/12 21:35:49 pgulutzan@linux.local +1 -0
    Logging to logging@openlogging.org accepted

  Docs/internals.texi
    1.23 03/03/12 21:35:29 pgulutzan@linux.local +3782 -0
    Added PeterG's new internals documentation.

ChangeSet
  1.1657 03/03/12 23:16:36 miguel@hegel.local +66 -0
  VC++ InstallShield Setup Programs for 4.0.XX tree

  VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Setup.tsb
    1.1 03/03/12 23:16:07 miguel@hegel.local +76 -0

  VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Setup.tsb
    1.0 03/03/12 23:16:07 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Setup.tsb

  VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Build.tsb
    1.1 03/03/12 23:16:06 miguel@hegel.local +56 -0

  VC++Files/InstallShield/4.0.XX-pro/String Tables/Default.shl
    1.1 03/03/12 23:16:06 miguel@hegel.local +74 -0

  VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl
    1.1 03/03/12 23:16:06 miguel@hegel.local +23 -0

  VC++Files/InstallShield/4.0.XX-pro/Shell Objects/Default.shl
    1.1 03/03/12 23:16:06 miguel@hegel.local +12 -0

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.1 03/03/12 23:16:06 miguel@hegel.local +350 -0

  VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Build.tsb
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Build.tsb

  VC++Files/InstallShield/4.0.XX-pro/String Tables/Default.shl
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/String Tables/Default.shl

  VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl

  VC++Files/InstallShield/4.0.XX-pro/Shell Objects/Default.shl
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Shell Objects/Default.shl

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.1 03/03/12 23:16:05 miguel@hegel.local +25 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul
    1.1 03/03/12 23:16:05 miguel@hegel.local +640 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.obs
    1.1 03/03/12 23:16:05 miguel@hegel.local +1460 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ins
    1.1 03/03/12 23:16:05 miguel@hegel.local +1271 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ino
    1.1 03/03/12 23:16:05 miguel@hegel.local +1304 -0

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.obs
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.obs

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ins
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ins

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ino
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ino

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.dbg
    1.1 03/03/12 23:16:04 miguel@hegel.local +634 -0

  VC++Files/InstallShield/4.0.XX-pro/Registry Entries/Default.rge
    1.1 03/03/12 23:16:04 miguel@hegel.local +4 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
    1.1 03/03/12 23:16:04 miguel@hegel.local +226 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Grant Tables.fgl
    1.1 03/03/12 23:16:04 miguel@hegel.local +36 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Documentation.fgl
    1.1 03/03/12 23:16:04 miguel@hegel.local +99 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl
    1.1 03/03/12 23:16:04 miguel@hegel.local +239 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.dbg
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.dbg

  VC++Files/InstallShield/4.0.XX-pro/Registry Entries/Default.rge
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Registry Entries/Default.rge

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Grant Tables.fgl
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Grant Tables.fgl

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Documentation.fgl
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Documentation.fgl

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Default.fdf
    1.1 03/03/12 23:16:03 miguel@hegel.local +82 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl
    1.1 03/03/12 23:16:03 miguel@hegel.local +31 -0

  VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.fgl
    1.1 03/03/12 23:16:03 miguel@hegel.local +42 -0

  VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.cdf
    1.1 03/03/12 23:16:03 miguel@hegel.local +192 -0

  VC++Files/InstallShield/4.0.XX-pro/4.0.XX-pro.ipr
    1.1 03/03/12 23:16:03 miguel@hegel.local +52 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Default.fdf
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Default.fdf

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl

  VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.fgl
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.fgl

  VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.cdf
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.cdf

  VC++Files/InstallShield/4.0.XX-pro/4.0.XX-pro.ipr
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/4.0.XX-pro.ipr

  VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Setup.tsb
    1.1 03/03/12 23:16:02 miguel@hegel.local +76 -0

  VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Build.tsb
    1.1 03/03/12 23:16:02 miguel@hegel.local +56 -0

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/Default.shl
    1.1 03/03/12 23:16:02 miguel@hegel.local +74 -0

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl
    1.1 03/03/12 23:16:02 miguel@hegel.local +23 -0

  VC++Files/InstallShield/4.0.XX-gpl/Shell Objects/Default.shl
    1.1 03/03/12 23:16:02 miguel@hegel.local +12 -0

  VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Setup.tsb
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Setup.tsb

  VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Build.tsb
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Build.tsb

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/Default.shl
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/String Tables/Default.shl

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl

  VC++Files/InstallShield/4.0.XX-gpl/Shell Objects/Default.shl
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Shell Objects/Default.shl

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.1 03/03/12 23:16:01 miguel@hegel.local +350 -0

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.1 03/03/12 23:16:01 miguel@hegel.local +25 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul
    1.1 03/03/12 23:16:01 miguel@hegel.local +640 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.obs
    1.1 03/03/12 23:16:01 miguel@hegel.local +1460 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ins
    1.1 03/03/12 23:16:01 miguel@hegel.local +1271 -0

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.obs
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.obs

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ins
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ins

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ino
    1.1 03/03/12 23:16:00 miguel@hegel.local +1304 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.dbg
    1.1 03/03/12 23:16:00 miguel@hegel.local +634 -0

  VC++Files/InstallShield/4.0.XX-gpl/Registry Entries/Default.rge
    1.1 03/03/12 23:16:00 miguel@hegel.local +4 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
    1.1 03/03/12 23:16:00 miguel@hegel.local +229 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Grant Tables.fgl
    1.1 03/03/12 23:16:00 miguel@hegel.local +36 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ino
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ino

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.dbg
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.dbg

  VC++Files/InstallShield/4.0.XX-gpl/Registry Entries/Default.rge
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Registry Entries/Default.rge

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Grant Tables.fgl
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Grant Tables.fgl

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Documentation.fgl
    1.1 03/03/12 23:15:59 miguel@hegel.local +101 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl
    1.1 03/03/12 23:15:59 miguel@hegel.local +241 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Default.fdf
    1.1 03/03/12 23:15:59 miguel@hegel.local +82 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl
    1.1 03/03/12 23:15:59 miguel@hegel.local +31 -0

  VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.fgl
    1.1 03/03/12 23:15:59 miguel@hegel.local +42 -0

  VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.cdf
    1.1 03/03/12 23:15:59 miguel@hegel.local +192 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Documentation.fgl
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Documentation.fgl

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Default.fdf
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Default.fdf

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl

  VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.fgl
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.fgl

  VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.cdf
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.cdf

  VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr
    1.1 03/03/12 23:15:58 miguel@hegel.local +51 -0

  VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Setup.tsb
    1.1 03/03/12 23:15:58 miguel@hegel.local +76 -0

  VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Build.tsb
    1.1 03/03/12 23:15:58 miguel@hegel.local +56 -0

  VC++Files/InstallShield/4.0.XX-classic/String Tables/Default.shl
    1.1 03/03/12 23:15:58 miguel@hegel.local +74 -0

  VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl
    1.1 03/03/12 23:15:58 miguel@hegel.local +23 -0

  VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr

  VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Setup.tsb
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Setup.tsb

  VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Build.tsb
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Build.tsb

  VC++Files/InstallShield/4.0.XX-classic/String Tables/Default.shl
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/String Tables/Default.shl

  VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl

  VC++Files/InstallShield/4.0.XX-classic/Shell Objects/Default.shl
    1.1 03/03/12 23:15:57 miguel@hegel.local +12 -0

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.1 03/03/12 23:15:57 miguel@hegel.local +350 -0

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.1 03/03/12 23:15:57 miguel@hegel.local +25 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul
    1.1 03/03/12 23:15:57 miguel@hegel.local +640 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.obs
    1.1 03/03/12 23:15:57 miguel@hegel.local +1460 -0

  VC++Files/InstallShield/4.0.XX-classic/Shell Objects/Default.shl
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Shell Objects/Default.shl

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.obs
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.obs

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ins
    1.1 03/03/12 23:15:56 miguel@hegel.local +1271 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ino
    1.1 03/03/12 23:15:56 miguel@hegel.local +1304 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.dbg
    1.1 03/03/12 23:15:56 miguel@hegel.local +634 -0

  VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge
    1.1 03/03/12 23:15:56 miguel@hegel.local +4 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
    1.1 03/03/12 23:15:56 miguel@hegel.local +226 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Grant Tables.fgl
    1.1 03/03/12 23:15:56 miguel@hegel.local +36 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ins
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ins

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ino
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ino

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.dbg
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.dbg

  VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Grant Tables.fgl
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Grant Tables.fgl

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Documentation.fgl
    1.1 03/03/12 23:15:55 miguel@hegel.local +99 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl
    1.1 03/03/12 23:15:55 miguel@hegel.local +239 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Default.fdf
    1.1 03/03/12 23:15:55 miguel@hegel.local +82 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl
    1.1 03/03/12 23:15:55 miguel@hegel.local +31 -0

  VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.fgl
    1.1 03/03/12 23:15:55 miguel@hegel.local +42 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Documentation.fgl
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Documentation.fgl

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Default.fdf
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Default.fdf

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl

  VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.fgl
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.fgl

  VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.cdf
    1.1 03/03/12 23:15:54 miguel@hegel.local +192 -0

  VC++Files/InstallShield/4.0.XX-classic/4.0.XX-classic.ipr
    1.1 03/03/12 23:15:54 miguel@hegel.local +51 -0

  VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.cdf
    1.0 03/03/12 23:15:54 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.cdf

  VC++Files/InstallShield/4.0.XX-classic/4.0.XX-classic.ipr
    1.0 03/03/12 23:15:54 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/4.0.XX-classic.ipr

ChangeSet
  1.1646.1.1 03/03/13 01:23:43 serg@serg.mysql.com +1 -0
  better help message

  sql/mysqld.cc
    1.404.1.1 03/03/13 01:23:40 serg@serg.mysql.com +1 -1
    better help message

ChangeSet
  1.676.288.1 03/03/12 22:50:22 bell@sanja.is.com.ua +1 -0
  added comment

  sql/sql_select.cc
    1.91.1.41 03/03/12 22:50:21 bell@sanja.is.com.ua +4 -0
    added comment

ChangeSet
  1.1656 03/03/12 20:33:41 Sinisa@sinisa.nasamreza.org +2 -0
  making sure that test works.

  mysql-test/t/innodb.test
    1.34 03/03/12 20:33:36 Sinisa@sinisa.nasamreza.org +1 -1
    making sure that test works.

  mysql-test/r/innodb.result
    1.56 03/03/12 20:33:36 Sinisa@sinisa.nasamreza.org +1 -1
    making sure that test works.

ChangeSet
  1.676.1.679 03/03/12 18:32:27 serg@serg.mysql.com +1 -0
  ha_myisam.cc:
    typo fixed

  sql/ha_myisam.cc
    1.73.2.11 03/03/12 18:32:15 serg@serg.mysql.com +1 -1
    typo fixed

ChangeSet
  1.1655 03/03/12 17:11:48 Sinisa@sinisa.nasamreza.org +4 -0
  Better fix for "Halloween" effect ...

  sql/sql_update.cc
    1.77 03/03/12 17:11:45 Sinisa@sinisa.nasamreza.org +6 -8
    Better fix for "Halloween" effect ...

  sql/sql_class.h
    1.143 03/03/12 17:11:45 Sinisa@sinisa.nasamreza.org +2 -2
    Better fix for "Halloween" effect ...

  sql/handler.h
    1.81 03/03/12 17:11:45 Sinisa@sinisa.nasamreza.org +1 -0
    Better fix for "Halloween" effect ...

  sql/ha_innodb.h
    1.50 03/03/12 17:11:45 Sinisa@sinisa.nasamreza.org +2 -1
    Better fix for "Halloween" effect ...

ChangeSet
  1.676.284.3 03/03/12 17:08:48 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a bug with column privileges ...

  sql/sql_base.cc
    1.74.1.29 03/03/12 17:08:46 Sinisa@sinisa.nasamreza.org +4 -3
    Fix for a bug with column privileges ...

ChangeSet
  1.676.1.676 03/03/12 16:43:01 monty@mashka.mysql.fi +3 -0
  NEWDATE -> DATE in anylyse() output
  Changed that analyse(#) also affects strings

  sql/sql_analyse.cc
    1.8.1.3 03/03/12 16:43:00 monty@mashka.mysql.fi +48 -32
    NEWDATE -> DATE in anylyse() output
    Changed that analyse(#) also affects strings
    Fixed that number of elements in ENUM is limited by # not by #+1

  mysql-test/t/analyse.test
    1.2.1.1 03/03/12 16:43:00 monty@mashka.mysql.fi +3 -2
    Better analyse test

  mysql-test/r/analyse.result
    1.2.1.1 03/03/12 16:43:00 monty@mashka.mysql.fi +12 -0
    Better analyse test

ChangeSet
  1.1654 03/03/12 14:48:00 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
  into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  sql/sql_parse.cc
    1.298 03/03/12 14:47:56 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1650.1.6 03/03/12 14:34:54 monty@mashka.mysql.fi +2 -0
  Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format)

  sql/field.h
    1.49 03/03/12 14:34:52 monty@mashka.mysql.fi +2 -1
    Fix for --new option

  sql/field.cc
    1.71 03/03/12 14:34:52 monty@mashka.mysql.fi +25 -0
    Fix for --new option

ChangeSet
  1.1653 03/03/12 14:34:07 Sinisa@sinisa.nasamreza.org +2 -0
  A little bit improved test case

  mysql-test/t/innodb.test
    1.33 03/03/12 14:34:01 Sinisa@sinisa.nasamreza.org +1 -1
    A little bit improved test case

  mysql-test/r/innodb.result
    1.55 03/03/12 14:34:01 Sinisa@sinisa.nasamreza.org +1 -1
    A little bit improved test case

ChangeSet
  1.1650.1.5 03/03/12 08:08:07 monty@mashka.mysql.fi +1 -0
  Proper fix for INSERT DELAYED and --max-delayed-threads

  sql/sql_insert.cc
    1.94 03/03/12 08:08:03 monty@mashka.mysql.fi +2 -3
    Proper fix for INSERT DELAYED and --max-delayed-threads

ChangeSet
  1.1650.1.4 03/03/12 07:51:08 monty@mashka.mysql.fi +2 -0
  Fix for replication of INSERT | REPLACE | CREATE  ... SELECT

  sql/sql_select.cc
    1.227 03/03/12 07:51:06 monty@mashka.mysql.fi +5 -8
    Fix for repllication of INSERT | REPLACE | CREATE  ... SELECT

  sql/sql_parse.cc
    1.296.1.1 03/03/12 07:51:06 monty@mashka.mysql.fi +3 -0
    Fix for replication of INSERT | REPLACE | CREATE  ... SELECT

ChangeSet
  1.1650.1.3 03/03/12 05:21:31 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mashka.mysql.fi:/home/my/mysql-4.0

  mysql-test/mysql-test-run.sh
    1.166 03/03/12 05:21:28 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1650.1.2 03/03/12 01:06:21 guilhem@mysql.com +1 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/home/mysql_src/mysql-4.0

  sql/sql_select.cc
    1.226 03/03/12 01:06:19 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1647.2.1 03/03/12 01:05:04 guilhem@mysql.com +1 -0
  Fix for bug #136. We must write the
  INSERT into u SELECT * from t
  to the binlog
  BEFORE unlocking t (which was read-locked at least in MyISAM),
  and not the contrary.

  sql/sql_select.cc
    1.224.1.1 03/03/12 01:05:00 guilhem@mysql.com +8 -1
    Fix for bug #136. We must write the
    INSERT into u SELECT * from t
    to the binlog
    BEFORE unlocking t (which was read-locked at least in MyISAM),
    and not the contrary.

ChangeSet
  1.1649.1.2 03/03/12 01:40:06 monty@mashka.mysql.fi +5 -0
  Simple fixes (nothing notable)

  sql/sql_class.cc
    1.100 03/03/12 01:40:02 monty@mashka.mysql.fi +2 -0
    Added DBUG info

  sql/slave.cc
    1.216 03/03/12 01:40:02 monty@mashka.mysql.fi +5 -11
    Simple optimization

  mysys/my_lib.c
    1.13 03/03/12 01:40:02 monty@mashka.mysql.fi +1 -1
    Fixed wrong dbug printf

  mysql-test/mysql-test-run.sh
    1.164.1.2 03/03/12 01:40:02 monty@mashka.mysql.fi +1 -1
    Longer stack trace from valgrind

  dbug/dbug.c
    1.14 03/03/12 01:40:02 monty@mashka.mysql.fi +0 -1
    Remove duplicate va_end() call

ChangeSet
  1.676.285.5 03/03/11 22:47:29 lenz@mysql.com +1 -0
   - Fixed man page for apropos/whatis (thanks to Christian Hammers from Debian
     for the patch) (bug #135)

  man/perror.1
    1.1.2.1 03/03/11 22:47:28 lenz@mysql.com +5 -10
     - Fixed man page for apropos/whatis (thanks to Christian Hammers from Debian
       for the patch) (bug #135)

ChangeSet
  1.676.287.1 03/03/11 21:20:53 serg@serg.mysql.com +4 -0
  fixed an obscure bug in group by + having + Item_ref::get_date

  sql/item.h
    1.11.1.5 03/03/11 21:20:51 serg@serg.mysql.com +7 -4
    fixed an obscure bug in group by + having + Item_ref::get_date

  sql/item.cc
    1.12.1.3 03/03/11 21:20:51 serg@serg.mysql.com +11 -0
    fixed an obscure bug in group by + having + Item_ref::get_date

  mysql-test/t/group_by.test
    1.3.1.9 03/03/11 21:20:51 serg@serg.mysql.com +8 -0
    fixed an obscure bug in group by + having + Item_ref::get_date

  mysql-test/r/group_by.result
    1.3.1.9 03/03/11 21:20:51 serg@serg.mysql.com +1 -0
    fixed an obscure bug in group by + having + Item_ref::get_date

ChangeSet
  1.1649.1.1 03/03/11 21:45:39 monty@mashka.mysql.fi +4 -0
  merge with 3.23 to get:
  - Better detection of crashed .MYI file
  - Ignore writeable config files

  sql/mysqld.cc
    1.406 03/03/11 21:45:36 monty@mashka.mysql.fi +1 -2
    merge with 3.23

  myisam/mi_open.c
    1.58 03/03/11 21:45:36 monty@mashka.mysql.fi +1 -2
    merge with 3.23

  mysys/default.c
    1.22 03/03/11 21:39:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.164.1.1 03/03/11 21:39:11 monty@mashka.mysql.fi +0 -2
    Auto merged

ChangeSet
  1.676.1.675 03/03/11 21:25:17 monty@mashka.mysql.fi +1 -0
  Cleaned up disk_pos_assert() to be more general. 

  myisam/mi_open.c
    1.31.1.6 03/03/11 21:25:16 monty@mashka.mysql.fi +13 -14
    Cleaned up disk_pos_assert() to be more general. 

ChangeSet
  1.676.285.2 03/03/11 18:54:57 lenz@mysql.com +1 -0
   - made test for multiple --user options more sh-compatible

  scripts/safe_mysqld.sh
    1.39.10.1 03/03/11 18:54:56 lenz@mysql.com +2 -2
     - made test for multiple --user options more sh-compatible

ChangeSet
  1.1652 03/03/11 19:40:49 Sinisa@sinisa.nasamreza.org +4 -0
  A  bug fix for multi-table updates with InnoDB storage engine

  sql/sql_update.cc
    1.76 03/03/11 19:40:45 Sinisa@sinisa.nasamreza.org +8 -5
    A  bug fix for multi-table updates with InnoDB storage engine

  sql/sql_class.h
    1.142 03/03/11 19:40:45 Sinisa@sinisa.nasamreza.org +1 -1
    A  bug fix for multi-table updates with InnoDB storage engine

  mysql-test/t/innodb.test
    1.32 03/03/11 19:40:45 Sinisa@sinisa.nasamreza.org +11 -0
    A  bug fix for multi-table updates with InnoDB storage engine

  mysql-test/r/innodb.result
    1.54 03/03/11 19:40:45 Sinisa@sinisa.nasamreza.org +17 -0
    A  bug fix for multi-table updates with InnoDB storage engine

ChangeSet
  1.676.286.1 03/03/11 18:34:00 bell@sanja.is.com.ua +3 -0
  fixed bug of unchecked random part of WHERE clause (bug #142)

  sql/sql_select.cc
    1.91.1.40 03/03/11 18:33:58 bell@sanja.is.com.ua +2 -0
    fixed bug of unchecked random part of WHERE clause

  mysql-test/t/select.test
    1.6.1.1 03/03/11 18:33:58 bell@sanja.is.com.ua +16 -1
    test of random WHERE clause

  mysql-test/r/select.result
    1.2.2.1 03/03/11 18:33:58 bell@sanja.is.com.ua +1 -0
    test of random WHERE clause

ChangeSet
  1.676.285.1 03/03/11 15:37:31 lenz@mysql.com +2 -0
   - fixed C++-style comments in .c files to make IBM compiler happy
     (it barfs on these with a syntax error)

  strings/ctype-tis620.c
    1.14.1.1 03/03/11 15:37:30 lenz@mysql.com +15 -15
     - fixed many C++-style comments

  sql/net_serv.cc
    1.15.1.7 03/03/11 15:37:30 lenz@mysql.com +1 -1
     - fixed C++-style comment (this file is copied as libmysql_r/net.c)

ChangeSet
  1.1650 03/03/11 13:52:19 gluh@gluh.mysql.r18.ru +3 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last

  mysql-test/mysql-test-run.sh
    1.165 03/03/11 13:52:16 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  client/mysqltest.c
    1.100 03/03/11 13:52:15 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.275 03/03/11 13:52:09 gluh@gluh.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1614.2.1 03/03/11 13:41:53 gluh@gluh.mysql.r18.ru +7 -0
  Openssl test

  BitKeeper/etc/logging_ok
    1.272.1.1 03/03/11 13:41:53 gluh@gluh.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/openssl_1.test
    1.5 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +41 -4
    Openssl test

  mysql-test/r/openssl_1.result
    1.5 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +32 -2
    Openssl test

  mysql-test/r/have_openssl_1.require
    1.3 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +1 -1
    Openssl test

  mysql-test/mysql-test-run.sh
    1.161.2.1 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +6 -2
    Openssl test

  mysql-test/include/have_openssl_1.inc
    1.3 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +1 -1
    Openssl test

  client/mysqltest.c
    1.97.2.1 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +17 -1
    For openssl test

ChangeSet
  1.1636.1.1 03/03/10 18:32:38 greg@mysql.com[greg] +1 -0
  novell40c.patch

  netware/mysqld_safe.c
    1.3 03/03/10 09:47:40 greg@mysql.com[greg] +52 -2
    Import patch novell40c.patch

ChangeSet
  1.676.1.674 03/03/11 00:17:34 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-3.23
  into mashka.mysql.fi:/home/my/mysql-3.23

  mysql-test/mysql-test-run.sh
    1.66.1.27 03/03/11 00:17:33 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1647.1.2 03/03/11 02:32:24 walrus@mysql.com +1 -0
  crash-me.sh:
    misprint correction

  sql-bench/crash-me.sh
    1.47 03/03/11 02:31:50 walrus@mysql.com +1 -1
    misprint correction

ChangeSet
  1.1647.1.1 03/03/10 20:21:11 lenz@mysql.com +1 -0
  - added missing file mysql_secure_installation to server RPM subpackage
    (bug #141) (please merge with 4.1 and onwards)

  support-files/mysql.spec.sh
    1.62 03/03/10 20:21:09 lenz@mysql.com +6 -0
    - added missing file mysql_secure_installation to server RPM subpackage
      (bug #141)

ChangeSet
  1.676.283.1 03/03/10 16:48:13 serg@serg.mysql.com +1 -0
  more propection in mi_open against badly corrupted MYI headers

  myisam/mi_open.c
    1.31.1.5 03/03/10 16:48:11 serg@serg.mysql.com +17 -2
    more propection in mi_open against badly corrupted MYI headers

ChangeSet
  1.676.282.1 03/03/10 17:14:01 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for an obvious bug in hash generating proram.

  sql/gen_lex_hash.cc
    1.39.1.5 03/03/10 17:13:59 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for an obvious bug in hash generating proram.

ChangeSet
  1.1644.1.1 03/03/10 16:58:07 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for privilege checking bug.

  sql/sql_parse.cc
    1.297 03/03/10 16:57:23 Sinisa@sinisa.nasamreza.org +7 -1
    Fix for a privilege bug in multi-table updates.
    Seems like better fix then chec_table_access.

ChangeSet
  1.676.1.672 03/03/10 13:41:37 lenz@mysql.com +1 -0
   - typo fix for newly added error message

  sql/mysqld.cc
    1.162.1.110 03/03/10 13:41:36 lenz@mysql.com +1 -1
     - typo fix for newly added error message

ChangeSet
  1.676.1.671 03/03/10 13:16:59 serg@serg.mysql.com +1 -0
  warning added

  mysys/default.c
    1.14.1.3 03/03/10 13:16:58 serg@serg.mysql.com +5 -1
    warning added

ChangeSet
  1.1648 03/03/10 14:13:46 monty@narttu.mysql.fi +20 -0
  merge

  sql/sql_table.cc
    1.151 03/03/10 14:13:45 monty@narttu.mysql.fi +2 -7
    merge

  sql/sql_rename.cc
    1.17 03/03/10 14:13:45 monty@narttu.mysql.fi +2 -3
    merge

  sql/sql_select.cc
    1.225 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.h
    1.26 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.215 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.54 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.405 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.188 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log_event.h
    1.75 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.44 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.119 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.48 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_datetime.test
    1.8 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/t/delete.test
    1.9 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_datetime.result
    1.12 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -6
    Auto merged

  mysql-test/r/delete.result
    1.8 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -15
    Auto merged

  libmysql/libmysql.c
    1.125 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.72 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-delete.result
    1.3 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.145 03/03/10 14:04:02 monty@narttu.mysql.fi +0 -8
    auto-union

ChangeSet
  1.1631.1.13 03/03/10 13:54:20 monty@narttu.mysql.fi +6 -0
  after merge fixes

  sql/mysqld.cc
    1.401.2.2 03/03/10 13:54:19 monty@narttu.mysql.fi +4 -4
    after merge fixes

  mysys/my_getopt.c
    1.34 03/03/10 13:54:19 monty@narttu.mysql.fi +2 -2
    after merge fixes

  mysql-test/r/type_datetime.result
    1.9.1.2 03/03/10 13:54:19 monty@narttu.mysql.fi +6 -0
    after merge fixes

  mysql-test/r/join.result
    1.20 03/03/10 13:54:19 monty@narttu.mysql.fi +19 -0
    after merge fixes

  mysql-test/r/delete.result
    1.6.1.1 03/03/10 13:54:19 monty@narttu.mysql.fi +15 -0
    after merge fixes

  mysql-test/r/backup.result
    1.9 03/03/10 13:54:19 monty@narttu.mysql.fi +23 -19
    after merge fixes

ChangeSet
  1.676.281.1 03/03/10 12:31:49 serg@serg.mysql.com +1 -0
  ignore world-writeable my.cnf's

  mysys/default.c
    1.14.1.2 03/03/10 12:31:48 serg@serg.mysql.com +13 -2
    ignore world-writeable my.cnf's

ChangeSet
  1.1631.1.12 03/03/10 12:48:43 monty@narttu.mysql.fi +27 -0
  Merge with 3.23 to get fixes for --user and BACKUP TABLE

  sql/sql_repl.h
    1.24.1.1 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    use local version

  sql/slave.cc
    1.213.1.2 03/03/10 12:48:42 monty@narttu.mysql.fi +3 -18
    use local version

  sql/mysqld.cc
    1.401.2.1 03/03/10 12:48:42 monty@narttu.mysql.fi +7 -8
    Use first --user option

  sql/mysql_priv.h
    1.187 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge

  sql/log_event.h
    1.73.1.1 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge

  sql/ha_myisam.cc
    1.117.1.1 03/03/10 12:48:42 monty@narttu.mysql.fi +5 -24
    Don't let BACKUP TABLE overwrite old files

  scripts/mysqld_safe.sh
    1.58 03/03/10 12:48:42 monty@narttu.mysql.fi +4 -0
    Only use first --user option

  mysql-test/t/backup.test
    1.11 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge with 3.23

  mysql-test/r/type_datetime.result
    1.9.1.1 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge (needs to be updated)

  mysql-test/r/join.result
    1.19 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -0
    merge (needs to be updated)

  mysql-test/r/backup.result
    1.8 03/03/10 12:48:42 monty@narttu.mysql.fi +6 -8
    merge (needs to be updated)

  mysql-test/mysql-test-run.sh
    1.164 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge with 3.23.56

  sql/sql_select.cc
    1.223.1.1 03/03/10 12:31:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_rename.cc
    1.16 03/03/10 12:31:09 monty@narttu.mysql.fi +0 -2
    Auto merged

  sql/share/polish/errmsg.txt
    1.52.1.1 03/03/10 12:31:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.77 03/03/10 12:31:09 monty@narttu.mysql.fi +1 -1
    Auto merged

  sql/field.h
    1.46.1.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_copy.c
    1.11 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_datetime.test
    1.6.1.1 03/03/10 12:31:08 monty@narttu.mysql.fi +1 -1
    Auto merged

  mysql-test/t/join.test
    1.16 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/delete.test
    1.7.1.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/backup.test
    1.6.2.2 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  mysql-test/r/backup.result
    1.4.1.2 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  libmysql/libmysql.c
    1.123.1.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.95 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.70.1.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5
    1.3 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-delete.result
    1.1.1.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/r/delete.result

  scripts/mysqld_safe.sh
    1.39.9.2 03/03/10 12:30:45 monty@narttu.mysql.fi +0 -0
    Merge rename: scripts/safe_mysqld.sh -> scripts/mysqld_safe.sh

  BitKeeper/etc/ignore
    1.142.2.1 03/03/10 12:30:34 monty@narttu.mysql.fi +8 -8
    auto-union

ChangeSet
  1.676.1.669 03/03/10 12:24:22 monty@narttu.mysql.fi +2 -0
  Don't allow multiple --user options to mysqld
  (First one is used)

  sql/mysqld.cc
    1.162.1.109 03/03/10 12:24:22 monty@narttu.mysql.fi +4 -1
    Don't allow multiple --user options

  scripts/safe_mysqld.sh
    1.39.9.1 03/03/10 12:24:22 monty@narttu.mysql.fi +6 -2
    Don't allow multiple --user options

ChangeSet
  1.1647 03/03/10 14:06:21 hf@deer.mysql.r18.ru +2 -0
  Handling of log-error added in embedded server

  BitKeeper/etc/logging_ok
    1.274 03/03/10 14:06:21 hf@deer.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  libmysqld/lib_sql.cc
    1.37 03/03/10 14:05:23 hf@deer.mysql.r18.ru +15 -0
    handling of log-error added to embedded server

ChangeSet
  1.1631.1.11 03/03/10 12:00:19 monty@narttu.mysql.fi +2 -0
  Fix that round(0.1,1) == round(0.1,1)

  sql/slave.cc
    1.213.1.1 03/03/10 12:00:18 monty@narttu.mysql.fi +4 -3
    Fixed problem with --debug output in handle_slave

  sql/item_func.cc
    1.88 03/03/10 12:00:18 monty@narttu.mysql.fi +13 -5
    Fix that round(0.1,1) == round(0.1,1)

ChangeSet
  1.676.1.668 03/03/10 11:50:46 monty@narttu.mysql.fi +1 -0
  Better fix for connect timeout problem.

  libmysql/libmysql.c
    1.56.1.23 03/03/10 11:50:46 monty@narttu.mysql.fi +37 -34
    Better fix for connect timeout problem.

ChangeSet
  1.676.280.1 03/03/10 11:22:37 monty@narttu.mysql.fi +8 -0
  Don't allow BACKUP TABLE to overwrite files
  Fixed memory leak when replication restarts in debug mode

  mysql-test/t/backup-master.sh
    1.1 03/03/10 11:22:36 monty@narttu.mysql.fi +5 -0

  sql/slave.cc
    1.100.1.35 03/03/10 11:22:36 monty@narttu.mysql.fi +18 -16
    Fixed problem with --debug output from 'handle_slave'
    Fixed memory leak when replication restarts in debug mode

  sql/ha_myisam.cc
    1.73.2.10 03/03/10 11:22:36 monty@narttu.mysql.fi +21 -21
    Don't allow BACKUP TABLE to overwrite files

  mysys/my_copy.c
    1.7.1.1 03/03/10 11:22:36 monty@narttu.mysql.fi +22 -8
    Added option to not overwrite files to my_copy()

  mysql-test/t/backup.test
    1.6.2.1 03/03/10 11:22:36 monty@narttu.mysql.fi +21 -18
    Update for security fix in BACKUP TABLE

  mysql-test/t/backup-master.sh
    1.0 03/03/10 11:22:36 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-3.23/mysql-test/t/backup-master.sh

  mysql-test/r/backup.result
    1.4.1.1 03/03/10 11:22:36 monty@narttu.mysql.fi +8 -6
    Update for security fix in BACKUP TABLE

  mysql-test/mysql-test-run.sh
    1.66.6.1 03/03/10 11:22:36 monty@narttu.mysql.fi +2 -2
    Fixed --ddd option
    Fixed that mysqld is restarted if there is a testname-master.sh file

  include/my_sys.h
    1.41.1.11 03/03/10 11:22:36 monty@narttu.mysql.fi +1 -0
    Added option to not overwrite files to my_copy()

ChangeSet
  1.676.275.17 03/03/10 00:21:04 serg@serg.mysql.com +1 -0
  .del-stamp-h.in~4a5d6676232516c5:
    Delete: innobase/stamp-h.in

  BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5
    1.1.1.1 03/03/10 00:20:56 serg@serg.mysql.com +0 -0
    Delete: innobase/stamp-h.in

ChangeSet
  1.1646 03/03/09 19:03:55 jani@rhols221.adsl.netsonic.fi +2 -0
  Made it possible to use --max-delayed-threads=0 in order to disable
  INSERT DELAYED.

  sql/sql_insert.cc
    1.93 03/03/09 19:03:53 jani@rhols221.adsl.netsonic.fi +2 -1
    Made it possible to use --max-delayed-threads=0 in order to disable
    INSERT DELAYED.

  sql/mysqld.cc
    1.404 03/03/09 19:03:53 jani@rhols221.adsl.netsonic.fi +2 -2
    Made it possible to use --max-delayed-threads=0 in order to disable
    INSERT DELAYED.

ChangeSet
  1.676.279.1 03/03/09 17:13:37 monty@mashka.mysql.fi +1 -0
  Changed --debug to append to test instead of creating new trace files.
  (This patch is already in 4.0)

  mysql-test/mysql-test-run.sh
    1.66.1.26 03/03/09 17:13:35 monty@mashka.mysql.fi +2 -2
    Changed --debug to append to test instead of creating new trace files

ChangeSet
  1.676.1.665 03/03/08 22:37:22 Sinisa@sinisa.nasamreza.org +1 -0
  Additional bug fix

  libmysql/libmysql.c
    1.56.1.22 03/03/08 22:37:20 Sinisa@sinisa.nasamreza.org +3 -0
    Additional fix for connection being established during select()

ChangeSet
  1.1645 03/03/08 18:53:32 guilhem@mysql.com +3 -0
  Clearer error message when one forgot to grant REPLICATION SLAVE :
  now we'll have something like this :
  030308 18:46:58  Slave I/O thread: connected to master 'gb@localhost:3306',  replication started in log 'FIRST' at position 4
  030308 18:46:58  While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
  030308 18:46:58  Slave I/O thread exiting, read up to log 'FIRST', position 4
  instead of "Error updating slave list: Query error".
  This fixes bug #80.

  sql/slave.cc
    1.214 03/03/08 18:53:27 guilhem@mysql.com +1 -1
    Updated for new syntax of update_slave_list

  sql/repl_failsafe.h
    1.7 03/03/08 18:53:27 guilhem@mysql.com +1 -1
    Clearer error message when one forgot to grant REPLICATION SLAVE

  sql/repl_failsafe.cc
    1.28 03/03/08 18:53:27 guilhem@mysql.com +33 -5
    Clearer error message when one forgot to grant REPLICATION SLAVE

ChangeSet
  1.676.1.664 03/03/08 19:35:44 Sinisa@sinisa.nasamreza.org +1 -0
  A correct fix for the timeout problem

  libmysql/libmysql.c
    1.56.1.21 03/03/08 19:35:41 Sinisa@sinisa.nasamreza.org +4 -7
    A correct fix for the timeout problem

ChangeSet
  1.1644 03/03/07 15:22:05 serg@serg.mysql.com +1 -0
  error messages translated by Egor

  sql/share/russian/errmsg.txt
    1.53 03/03/07 15:22:02 serg@serg.mysql.com +222 -223
    error messages translated by Egor

ChangeSet
  1.676.1.663 03/03/07 14:40:37 monty@mashka.mysql.fi +4 -0
  Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp()

  sql/sql_rename.cc
    1.6.1.3 03/03/07 14:40:35 monty@mashka.mysql.fi +2 -2
    Added missing DEBUG_PRINT()

  sql/opt_range.cc
    1.44.1.4 03/03/07 14:40:35 monty@mashka.mysql.fi +8 -4
    Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp()

  mysql-test/t/join.test
    1.3.2.5 03/03/07 14:40:35 monty@mashka.mysql.fi +24 -0
    Test of range optimizer bug

  mysql-test/r/join.result
    1.3.3.5 03/03/07 14:40:35 monty@mashka.mysql.fi +4 -0
    Test of range optimizer bug

ChangeSet
  1.1643 03/03/07 11:58:07 serg@serg.mysql.com +1 -0
  Merge work:/home/bk/mysql-4.0
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/mysqld.cc
    1.403 03/03/07 11:58:04 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1633.1.4 03/03/07 11:55:07 serg@serg.mysql.com +1 -0
  missing grant check added

  sql/sql_parse.cc
    1.296 03/03/07 11:55:04 serg@serg.mysql.com +2 -0
    missing grant check added

ChangeSet
  1.1642 03/03/07 12:37:18 monty@mashka.mysql.fi +2 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  configure.in
    1.267 03/03/07 12:37:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.144 03/03/07 12:37:10 monty@mashka.mysql.fi +0 -2
    auto-union

ChangeSet
  1.1631.5.3 03/03/07 12:36:52 monty@mashka.mysql.fi +7 -0
  Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
  Some after merge fixes

  sql/ha_myisam.cc
    1.118 03/03/07 12:36:51 monty@mashka.mysql.fi +7 -7
    Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)

  mysql-test/t/select.test
    1.16 03/03/07 12:36:51 monty@mashka.mysql.fi +0 -2
    Remove explicit database usage

  mysql-test/t/ctype_latin1_de.test
    1.5 03/03/07 12:36:51 monty@mashka.mysql.fi +2 -2
    Changed test to have more relevant results

  mysql-test/r/type_datetime.result
    1.11 03/03/07 12:36:51 monty@mashka.mysql.fi +0 -15
    Updated results after merge

  mysql-test/r/select.result
    1.22 03/03/07 12:36:51 monty@mashka.mysql.fi +0 -1
    Remove explicit database usage

  mysql-test/r/delete.result
    1.7 03/03/07 12:36:51 monty@mashka.mysql.fi +15 -0
    Updated results after merge

  mysql-test/r/ctype_latin1_de.result
    1.6 03/03/07 12:36:51 monty@mashka.mysql.fi +107 -103
    Changed test to have more relevant results

ChangeSet
  1.1641 03/03/07 10:20:44 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Fix bug in previous push

  innobase/os/os0file.c
    1.47 03/03/07 10:20:37 heikki@hundin.mysql.fi +2 -2
    Fix bug in previous push

ChangeSet
  1.1640 03/03/07 10:07:06 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken

  innobase/os/os0file.c
    1.46 03/03/07 10:06:57 heikki@hundin.mysql.fi +24 -4
    Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken

ChangeSet
  1.1631.5.2 03/03/07 01:20:56 monty@mashka.mysql.fi +17 -0
  Merge to get fix for LOCK TABLES + DROP TABLE in another thread

  sql/sql_table.cc
    1.149.1.1 03/03/07 01:20:54 monty@mashka.mysql.fi +7 -11
    Merge to get fix for LOCK TABLES + DROP TABLE in another thread

  sql/sql_repl.h
    1.25 03/03/07 01:20:54 monty@mashka.mysql.fi +0 -1
    Use local version

  sql/sql_rename.cc
    1.14.1.1 03/03/07 01:20:54 monty@mashka.mysql.fi +3 -3
    Merge to get fix for LOCK TABLES + DROP TABLE in another thread

  sql/mysqld.cc
    1.401.1.1 03/03/07 01:20:54 monty@mashka.mysql.fi +0 -3
    Use local version

  sql/mysql_priv.h
    1.185.1.1 03/03/07 01:20:54 monty@mashka.mysql.fi +0 -1
    Use local version

  sql/log_event.h
    1.74 03/03/07 01:20:54 monty@mashka.mysql.fi +0 -1
    Use local version

  mysql-test/r/type_datetime.result
    1.10 03/03/07 01:20:54 monty@mashka.mysql.fi +21 -1
    Update results after merge

  sql/sql_select.cc
    1.224 03/03/07 01:02:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.53 03/03/07 01:02:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.42.1.1 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/field.h
    1.47 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_datetime.test
    1.7 03/03/07 01:02:13 monty@mashka.mysql.fi +1 -1
    Auto merged

  mysql-test/t/delete.test
    1.8 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.124 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.71 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-delete.result
    1.2 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/delete.result

  BitKeeper/etc/ignore
    1.142.1.1 03/03/07 01:01:18 monty@mashka.mysql.fi +8 -8
    auto-union

ChangeSet
  1.1631.5.1 03/03/07 01:00:58 monty@mashka.mysql.fi +3 -0
  Portability fix for IBM compiler on AIX

  sql-bench/crash-me.sh
    1.46 03/03/07 01:00:55 monty@mashka.mysql.fi +30 -7
    Fix for connect test

  mysys/my_tempnam.c
    1.13 03/03/07 01:00:55 monty@mashka.mysql.fi +8 -2
    Portability fix for IBM compiler on AIX

  configure.in
    1.265.1.1 03/03/07 01:00:55 monty@mashka.mysql.fi +0 -1
    Remove duplicated configure line

ChangeSet
  1.1639 03/03/06 22:53:58 guilhem@mysql.com +1 -0
  remove spaces according to coding rules

  sql/sql_insert.cc
    1.92 03/03/06 22:53:56 guilhem@mysql.com +2 -2
    remove spaces according to coding rules

ChangeSet
  1.1638 03/03/06 22:46:24 guilhem@mysql.com +1 -0
  Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug #104)

  sql/sql_insert.cc
    1.91 03/03/06 22:41:06 guilhem@mysql.com +28 -11
    Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug #104)

ChangeSet
  1.1637 03/03/06 16:22:31 guilhem@mysql.com +1 -0
  Make log_pos be non-zero in the binary log, for BEGIN and COMMIT Query_log_events.
  Now log_pos is the real position of the event. For events that are between BEGIN and COMMIT,
  log_pos is still the BEGIN's log_pos.
  This fixes bug #52 (If only transactions are run on the master then t

  sql/log.cc
    1.112 03/03/06 16:22:29 guilhem@mysql.com +9 -0
    Make log_pos be non-zero in the binary log, for BEGIN and COMMIT Query_log_events.
    Now log_pos is the real position of the event. For events that are between BEGIN and COMMIT,
    log_pos is still the BEGIN's log_pos.
    This fixes bug #52 (If only transactions are run on the master then t

ChangeSet
  1.1633.1.3 03/03/06 10:54:27 serg@serg.mysql.com +2 -0
  disable partial timestamps in --new mode

  sql/field.cc
    1.70 03/03/06 10:54:24 serg@serg.mysql.com +6 -10
    disable partial timestamps in --new mode

  mysql-test/r/type_timestamp.result
    1.9 03/03/06 10:54:24 serg@serg.mysql.com +2 -2
    disable partial timestamps in --new mode

ChangeSet
  1.1636 03/03/05 18:47:08 greg@mysql.com +1 -0
  Remove netware.patch (not needed)

  BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee
    1.2 03/03/05 18:43:58 greg@mysql.com +0 -0
    Delete: netware/netware.patch

ChangeSet
  1.1633.1.2 03/03/05 18:43:56 serg@serg.mysql.com +7 -0
  --new option and local variable to optionally turn on
  "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/unireg.h
    1.17 03/03/05 18:43:53 serg@serg.mysql.com +1 -2
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/sql_class.h
    1.141 03/03/05 18:43:53 serg@serg.mysql.com +2 -1
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/set_var.cc
    1.24 03/03/05 18:43:53 serg@serg.mysql.com +3 -0
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/mysqld.cc
    1.402 03/03/05 18:43:53 serg@serg.mysql.com +8 -9
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/field.cc
    1.69 03/03/05 18:43:53 serg@serg.mysql.com +23 -6
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  mysql-test/t/type_timestamp.test
    1.7 03/03/05 18:43:53 serg@serg.mysql.com +14 -0
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  mysql-test/r/type_timestamp.result
    1.8 03/03/05 18:43:53 serg@serg.mysql.com +20 -0
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

ChangeSet
  1.676.1.662 03/03/05 15:45:11 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql
  into sinisa.nasamreza.org:/mnt/work/mysql

  sql/mysql_priv.h
    1.93.1.17 03/03/05 15:45:09 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.676.1.661 03/03/05 15:34:58 Sinisa@sinisa.nasamreza.org +5 -0
  A better, but larger fix for server_id bug ..

  sql/sql_repl.h
    1.5.1.3 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +1 -1
    A better, but larger fix for server_id bug ..

  sql/mysqld.cc
    1.162.1.108 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +3 -3
    A better, but larger fix for server_id bug ..

  sql/mysql_priv.h
    1.93.3.1 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +1 -1
    A better, but larger fix for server_id bug ..

  sql/log_event.h
    1.41.1.5 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +1 -1
    A better, but larger fix for server_id bug ..

  client/mysqlbinlog.cc
    1.44.1.7 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +1 -1
    A better, but larger fix for server_id bug ..

ChangeSet
  1.1633.1.1 03/03/05 13:10:23 serg@serg.mysql.com +1 -0
  my_dir.h is included by raid.h

  include/Makefile.am
    1.37 03/03/05 13:10:21 serg@serg.mysql.com +2 -2
    my_dir.h is included by raid.h

ChangeSet
  1.1635 03/03/05 12:42:10 lenz@mysql.com +1 -0
   - Fixed URL to Using_stack_trace.html (the old one still works, but gets
     redirected to the new location

  sql/stacktrace.c
    1.13 03/03/05 12:42:08 lenz@mysql.com +1 -1
     - Fixed URL to Using_stack_trace.html (the old one still works, but gets
       redirected to the new location

ChangeSet
  1.1634 03/03/05 09:49:28 lenz@mysql.com +1 -0
   - safeguard against an endless loop when MIT pthreads are not installed
     (Bug #121)

  configure.in
    1.266 03/03/05 09:49:25 lenz@mysql.com +1 -1
     - safeguard against an endless loop when MIT pthreads are not installed
       (Bug #121)

ChangeSet
  1.1631.3.4 03/03/04 18:20:11 gweir@work.mysql.com +12 -0
  Many files:
    Change mode to -rwxrwxr-x

ChangeSet
  1.1631.4.1 03/03/04 18:18:05 lenz@mysql.com +2 -0
   - added missing file mysql-test/std_data/des_key_file to source and binary
     distribution to fix a test failure in test "func_encrypt"

  scripts/make_binary_distribution.sh
    1.50 03/03/04 18:18:03 lenz@mysql.com +1 -0
     - added missing file mysql-test/std_data/des_key_file to source and binary
       distribution to fix a test failure in test "func_encrypt"

  mysql-test/Makefile.am
    1.21 03/03/04 18:18:03 lenz@mysql.com +2 -0
     - added missing file mysql-test/std_data/des_key_file to source and binary
       distribution to fix a test failure in test "func_encrypt"

  netware/BUILD/nwbootstrap
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwldnlm
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwenv
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwccnlm
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwasmnlm
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-standard
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-debug
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-all
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-START
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-END
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-linux-tools
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-AUTOTOOLS
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

ChangeSet
  1.1631.3.3 03/03/04 19:14:37 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated

  sql/ha_innodb.cc
    1.159 03/03/04 19:14:28 heikki@hundin.mysql.fi +4 -0
    Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated

ChangeSet
  1.1631.3.2 03/03/04 19:06:40 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash

  sql/ha_innodb.cc
    1.158 03/03/04 19:06:33 heikki@hundin.mysql.fi +1 -4
    Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash

ChangeSet
  1.676.278.1 03/03/04 18:02:56 serg@serg.mysql.com +4 -0
  fixed Field::eq() to work with CHAR(0) fields

  mysql-test/r/delete.result
    1.1 03/03/04 18:02:55 serg@serg.mysql.com +4 -0

  sql/field.h
    1.25.1.5 03/03/04 18:02:55 serg@serg.mysql.com +1 -1
    fixed Field::eq() to work with CHAR(0) fields

  mysql-test/t/delete.test
    1.2.1.1 03/03/04 18:02:55 serg@serg.mysql.com +20 -0
    fixed Field::eq() to work with CHAR(0) fields

  mysql-test/r/delete.result
    1.0 03/03/04 18:02:55 serg@serg.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql/mysql-test/r/delete.result

  BitKeeper/etc/ignore
    1.61.1.22 03/03/04 18:02:55 serg@serg.mysql.com +2 -0
    Added configure.lineno innobase/configure.lineno to the ignore list

ChangeSet
  1.676.1.660 03/03/04 18:23:15 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for SHOW VARIABLES on 64-bit platforms

  sql/mysqld.cc
    1.162.1.107 03/03/04 18:23:13 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for SHOW VARIABLES on 64-bit platforms

ChangeSet
  1.1631.3.1 03/03/04 14:05:23 heikki@hundin.mysql.fi +1 -0
  buf0buf.c:
    Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized

  innobase/buf/buf0buf.c
    1.18 03/03/04 14:05:15 heikki@hundin.mysql.fi +11 -3
    Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized

ChangeSet
  1.1631.1.10 03/03/04 13:36:59 monty@narttu.mysql.fi +4 -0
  Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread

  sql/sql_table.cc
    1.150 03/03/04 13:36:58 monty@narttu.mysql.fi +7 -9
    merge

  sql/sql_rename.cc
    1.15 03/03/04 13:36:58 monty@narttu.mysql.fi +3 -3
    merge

  sql/mysql_priv.h
    1.186 03/03/04 13:07:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.43 03/03/04 13:07:44 monty@narttu.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1631.1.9 03/03/04 12:32:28 monty@narttu.mysql.fi +3 -0
  Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0

  sql/handler.cc
    1.95 03/03/04 12:32:26 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.163 03/03/04 12:32:26 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.99 03/03/04 12:32:26 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1628.1.1 03/03/04 12:22:35 monty@narttu.mysql.fi +11 -0
  Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped

  sql/sql_base.cc
    1.153 03/03/04 12:22:34 monty@narttu.mysql.fi +38 -8
    Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped

  sql/mysqld.cc
    1.401 03/03/04 12:22:34 monty@narttu.mysql.fi +2 -2
    Use automatic recover even with --safe

  sql/mysql_priv.h
    1.185 03/03/04 12:22:33 monty@narttu.mysql.fi +1 -0
    Added function to abort a lock for a specific thread

  sql/lock.cc
    1.42 03/03/04 12:22:33 monty@narttu.mysql.fi +19 -0
    Added function to abort a lock for a specific thread

  sql/handler.cc
    1.93.1.1 03/03/04 12:22:33 monty@narttu.mysql.fi +2 -1
    Indentation cleanup

  mysys/thr_lock.c
    1.35 03/03/04 12:22:33 monty@narttu.mysql.fi +48 -0
    Added function to abort a lock for a specific thread

  mysql-test/t/lock_multi.test
    1.4 03/03/04 12:22:33 monty@narttu.mysql.fi +22 -2
    Test for LOCK TABLE + DROP TABLE bug

  mysql-test/r/lock_multi.result
    1.5 03/03/04 12:22:33 monty@narttu.mysql.fi +8 -1
    Test for LOCK TABLE + DROP TABLE bug

  mysql-test/mysql-test-run.sh
    1.161.1.1 03/03/04 12:22:33 monty@narttu.mysql.fi +2 -1
    Fixed where mysqltest traces are put

  include/thr_lock.h
    1.12 03/03/04 12:22:33 monty@narttu.mysql.fi +1 -0
    Added function to abort a lock for a specific thread

  client/mysqltest.c
    1.97.1.1 03/03/04 12:22:33 monty@narttu.mysql.fi +1 -0
    Fixed bug that comments did a ping

ChangeSet
  1.1631.1.8 03/03/03 23:04:36 greg@mysql.com +16 -0
  New build scripts for NetWare

  netware/BUILD/nwbootstrap
    1.1 03/03/03 23:04:35 greg@mysql.com +166 -0

  netware/BUILD/mwldnlm
    1.1 03/03/03 23:04:35 greg@mysql.com +5 -0

  netware/BUILD/mwenv
    1.1 03/03/03 23:04:35 greg@mysql.com +29 -0

  netware/BUILD/mwccnlm
    1.1 03/03/03 23:04:35 greg@mysql.com +7 -0

  netware/BUILD/mwasmnlm
    1.1 03/03/03 23:04:35 greg@mysql.com +5 -0

  netware/BUILD/compile-netware-standard
    1.1 03/03/03 23:04:35 greg@mysql.com +14 -0

  netware/BUILD/nwbootstrap
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/nwbootstrap

  netware/BUILD/mwldnlm
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/mwldnlm

  netware/BUILD/mwenv
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/mwenv

  netware/BUILD/mwccnlm
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/mwccnlm

  netware/BUILD/mwasmnlm
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/mwasmnlm

  netware/BUILD/compile-netware-standard
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-standard

  netware/BUILD/compile-netware-debug
    1.1 03/03/03 23:04:34 greg@mysql.com +15 -0

  netware/BUILD/compile-netware-all
    1.1 03/03/03 23:04:34 greg@mysql.com +8 -0

  netware/BUILD/compile-netware-START
    1.1 03/03/03 23:04:34 greg@mysql.com +23 -0

  netware/BUILD/compile-netware-END
    1.1 03/03/03 23:04:34 greg@mysql.com +35 -0

  netware/BUILD/compile-linux-tools
    1.1 03/03/03 23:04:34 greg@mysql.com +52 -0

  netware/BUILD/compile-AUTOTOOLS
    1.1 03/03/03 23:04:34 greg@mysql.com +16 -0

  netware/BUILD/compile-netware-debug
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-debug

  netware/BUILD/compile-netware-all
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-all

  netware/BUILD/compile-netware-START
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-START

  netware/BUILD/compile-netware-END
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-END

  netware/BUILD/compile-linux-tools
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-linux-tools

  netware/BUILD/compile-AUTOTOOLS
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-AUTOTOOLS

  BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980
    1.2 03/03/03 23:02:17 greg@mysql.com +0 -0
    Delete: netware/mw/mwldnlm

  BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f
    1.2 03/03/03 23:02:17 greg@mysql.com +0 -0
    Delete: netware/mw/mwccnlm

  BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5
    1.2 03/03/03 23:02:17 greg@mysql.com +0 -0
    Delete: netware/mw/mwasmnlm

  BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa
    1.2 03/03/03 23:02:07 greg@mysql.com +0 -0
    Delete: netware/mw/mwenv

ChangeSet
  1.1631.1.7 03/03/03 23:00:49 greg@mysql.com[greg] +1 -0
  novell40b.patch

  netware/mysql_fix_privilege_tables.pl
    1.1 03/03/03 11:05:15 greg@mysql.com[greg] +125 -0
    Import patch novell40b.patch

  netware/mysql_fix_privilege_tables.pl
    1.0 03/03/03 11:05:15 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/mysql_fix_privilege_tables.pl

ChangeSet
  1.676.275.15 03/03/03 20:42:49 monty@narttu.mysql.fi +4 -0
  Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another

  sql/sql_table.cc
    1.83.1.29 03/03/03 20:42:48 monty@narttu.mysql.fi +7 -4
    Require table name locks when doing drop table.
    This fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another

  sql/sql_rename.cc
    1.6.1.2 03/03/03 20:42:48 monty@narttu.mysql.fi +10 -22
    Use new general table name lock functions

  sql/mysql_priv.h
    1.93.1.16 03/03/03 20:42:48 monty@narttu.mysql.fi +3 -0
    Added functions to handle list of named locks

  sql/lock.cc
    1.24.1.6 03/03/03 20:42:48 monty@narttu.mysql.fi +74 -2
    Added functions to handle list of table name locks

ChangeSet
  1.1631.1.5 03/03/03 19:31:01 heikki@hundin.mysql.fi +5 -0
  ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/ha_innodb.h
    1.49 03/03/03 19:30:46 heikki@hundin.mysql.fi +1 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/ha_innodb.cc
    1.157 03/03/03 19:30:44 heikki@hundin.mysql.fi +13 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/handler.h
    1.80 03/03/03 19:30:37 heikki@hundin.mysql.fi +1 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/handler.cc
    1.94 03/03/03 19:30:35 heikki@hundin.mysql.fi +30 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/sql_class.cc
    1.99 03/03/03 19:30:29 heikki@hundin.mysql.fi +16 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

ChangeSet
  1.1631.2.1 03/03/03 16:01:05 lenz@mysql.com +1 -0
   - added option "--skip-dmg" to skip the building of the disk image after
     packaging
   - enclosed some variables in quotes for safeguarding
   - add a license file (GPL or MySQLEULA) to the package so it will be
     displayed during installation (needs to be tested)

  Build-tools/Do-pkg
    1.3 03/03/03 16:01:03 lenz@mysql.com +36 -4
     - added option "--skip-dmg" to skip the building of the disk image after
       packaging
     - enclosed some variables in quotes for safeguarding
     - add a license file (GPL or MySQLEULA) to the package so it will be
       displayed during installation (needs to be tested)

ChangeSet
  1.1631.1.4 03/03/03 16:29:16 heikki@hundin.mysql.fi +1 -0
  srv0start.c:
    Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf

  innobase/srv/srv0start.c
    1.39 03/03/03 16:29:07 heikki@hundin.mysql.fi +17 -6
    Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf

ChangeSet
  1.1631.1.3 03/03/03 14:57:02 guilhem@mysql.com +5 -0
  Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
  + fix for #70 
  + test result fix for LOAD DATA LOCAL bug #82

  sql/sql_repl.cc
    1.91 03/03/03 14:57:00 guilhem@mysql.com +6 -0
    When we RESET SLAVE, clear mi->master_log_* to give a good display in SHOW SLAVE STATUS (bug #70)

  sql/slave.cc
    1.213 03/03/03 14:57:00 guilhem@mysql.com +27 -6
    When we RESET SLAVE, clear rli->master_log_* to give a good display in SHOW SLAVE STATUS ;
    seeing the old values may confuse the user.
    When we START SLAVE, clear rli->master_log_name, not only rli->master_log_pos.

  mysql-test/r/rpl000001.result
    1.21 03/03/03 14:57:00 guilhem@mysql.com +1 -1
    SUM is 1022 (1021 was when we had the LOAD DATA LOCAL bug #82).
    It's logical to have an even number as we load the same file twice.

  mysql-test/mysql-test-run.sh
    1.162 03/03/03 14:57:00 guilhem@mysql.com +4 -4
    Fix $slave_datadir variable because this
      if [ -n "$1" ] ; 
       slave_datadir="var/$slave_ident-data/"
      else
        slave_datadir=$SLAVE_MYDDIR
    was not coherent and led to problems of master.info not being deleted.
    Delete relay-log.info too.

  client/mysqltest.c
    1.98 03/03/03 14:56:59 guilhem@mysql.com +0 -7
    Removed wrong comment and useless sleep

ChangeSet
  1.1631.1.2 03/03/02 22:34:09 heikki@hundin.mysql.fi +3 -0
  trx0sys.c, trx0roll.c, srv0start.h:
    Print trx rollback progress info in crash recovery

  innobase/trx/trx0sys.c
    1.14 03/03/02 22:33:51 heikki@hundin.mysql.fi +24 -2
    Print trx rollback progress info in crash recovery

  innobase/trx/trx0roll.c
    1.8 03/03/02 22:33:46 heikki@hundin.mysql.fi +44 -5
    Print trx rollback progress info in crash recovery

  innobase/include/srv0start.h
    1.7 03/03/02 22:33:34 heikki@hundin.mysql.fi +1 -0
    Print trx rollback progress info in crash recovery

ChangeSet
  1.1631.1.1 03/03/02 18:20:32 guilhem@mysql.com +3 -0
  ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests

  sql/mf_iocache.cc
    1.24 03/03/02 18:20:30 guilhem@mysql.com +0 -1
    ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

  mysql-test/t/rpl_loaddatalocal.test
    1.2 03/03/02 18:20:30 guilhem@mysql.com +36 -0
    ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

  mysql-test/r/rpl_loaddatalocal.result
    1.2 03/03/02 18:20:30 guilhem@mysql.com +14 -0
    ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

ChangeSet
  1.1632 03/03/02 14:07:32 serg@serg.mysql.com +4 -0
  optimizer should check for "field LIKE const" not "field like STRING"

  sql/item_cmpfunc.cc
    1.50 03/03/02 14:07:30 serg@serg.mysql.com +8 -4
    optimizer should check for "field LIKE const" not "field like STRING"

  mysql-test/t/func_like.test
    1.7 03/03/02 14:07:30 serg@serg.mysql.com +7 -4
    optimizer should check for "field LIKE const" not "field like STRING"

  mysql-test/r/func_like.result
    1.7 03/03/02 14:07:30 serg@serg.mysql.com +10 -0
    optimizer should check for "field LIKE const" not "field like STRING"

  BitKeeper/etc/ignore
    1.143 03/03/02 14:07:30 serg@serg.mysql.com +2 -0
    Added configure.lineno innobase/configure.lineno to the ignore list

ChangeSet
  1.1613.1.1 03/03/02 01:48:57 serg@serg.mysql.com +6 -0
  fix auto-increment in sub-key and insert ... select

  sql/ha_myisam.cc
    1.117 03/03/02 01:48:55 serg@serg.mysql.com +4 -3
    fix auto-increment in sub-key and insert ... select

  mysql-test/t/auto_increment.test
    1.6 03/03/02 01:48:55 serg@serg.mysql.com +8 -0
    fix auto-increment in sub-key and insert ... select

  mysql-test/r/auto_increment.result
    1.8 03/03/02 01:48:55 serg@serg.mysql.com +10 -0
    fix auto-increment in sub-key and insert ... select

  myisam/mi_create.c
    1.30 03/03/02 01:48:55 serg@serg.mysql.com +1 -1
    fix auto-increment in sub-key and insert ... select

  myisam/mi_check.c
    1.114 03/03/02 01:48:55 serg@serg.mysql.com +2 -2
    fix auto-increment in sub-key and insert ... select

  include/myisam.h
    1.52 03/03/02 01:48:55 serg@serg.mysql.com +1 -0
    fix auto-increment in sub-key and insert ... select

ChangeSet
  1.1630 03/03/02 00:45:19 guilhem@mysql.com +2 -0
  Replication: simplification of init_relay_log_pos: always initialize,
  remove variable rli->log_pos_current.

  sql/slave.h
    1.55 03/03/02 00:45:15 guilhem@mysql.com +0 -1
    Simplification of init_relay_log_pos : always initialize,
    remove variable rli->log_pos_current.

  sql/slave.cc
    1.212 03/03/02 00:45:15 guilhem@mysql.com +1 -8
    Simplification of init_relay_log_pos : always initialize,
    remove variable rli->log_pos_current.

ChangeSet
  1.1629 03/03/02 00:34:44 guilhem@mysql.com +2 -0
  When the SQL thread cannot read an event from the relay log
  ("Event too big" etc), stop this thread instead of going on
  with the next event, which would certainly lead to slave's data
  corruption.

  BitKeeper/etc/logging_ok
    1.273 03/03/02 00:34:43 guilhem@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/log_event.cc
    1.99 03/03/02 00:33:37 guilhem@mysql.com +9 -0
    When the SQL thread cannot read an event from the relay log
    ("Event too big" etc), stop this thread instead of going on
    with the next event, which would certainly lead to slave's data
    corruption.

ChangeSet
  1.1622.1.3 03/02/28 22:24:00 monty@narttu.mysql.fi +105 -0
  LOAD DATA INFILE is not replicated if replicate_*_table is set
  LOAD DATA LOCAL INFILE was not replicated correctly

  mysql-test/t/rpl_loaddatalocal.test
    1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +0 -0

  mysql-test/r/rpl_loaddatalocal.result
    1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +0 -0

  sql/mf_iocache.cc
    1.23 03/02/28 22:23:59 monty@narttu.mysql.fi +7 -2
    LOAD DATA LOCAL INFILE was not replicated correctly

  sql/log_event.cc
    1.98 03/02/28 22:23:59 monty@narttu.mysql.fi +1 -0
    LOAD DATA INFILE is not replicated if replicate_*_table is set

  mysql-test/t/rpl_loaddatalocal.test
    1.0 03/02/28 22:23:59 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/rpl_loaddatalocal.test

  mysql-test/r/rpl_loaddatalocal.result
    1.0 03/02/28 22:23:59 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/rpl_loaddatalocal.result

  include/my_global.h
    1.37 03/02/28 22:23:59 monty@narttu.mysql.fi +1 -0
    Always include errno.h

  VC++Files/zlib/zlib.dsp
    1.4 03/02/28 22:23:59 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/vio/vio.dsp
    1.5 03/02/28 22:23:59 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/thr_test/thr_test.dsp
    1.5 03/02/28 22:23:59 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/thr_insert_test/thr_insert_test.dsp
    1.5 03/02/28 22:23:59 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/test1/test1.dsp
    1.5 03/02/28 22:23:59 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/strings/strings.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/strings/strings.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +9 -9
    Updated VC++ files +end space removed

  VC++Files/strings/noMASM/strings.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/strings/noMASM/strings.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/strings/backup/strings.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/strings/backup/strings.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +9 -9
    Updated VC++ files +end space removed

  VC++Files/strings/MASM6x/strings.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/strings/MASM6x/strings.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +9 -9
    Updated VC++ files +end space removed

  VC++Files/sql/old/mysqld.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/sql/mysqldmax.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +56 -56
    Updated VC++ files +end space removed

  VC++Files/sql/mysqld.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/sql/mysqld.dsp
    1.8 03/02/28 22:23:58 monty@narttu.mysql.fi +56 -56
    Updated VC++ files +end space removed

  VC++Files/replace/replace.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/regex/regex.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/regex/regex.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/perror/perror.dsp
    1.6 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/pack_isam/pack_isam.dsp
    1.6 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysys/mysys.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/mysys/mysys.dsp
    1.7 03/02/28 22:23:58 monty@narttu.mysql.fi +13 -9
    Updated VC++ files +end space removed

  VC++Files/mysqlwatch/mysqlwatch.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +6 -6
    Updated VC++ files +end space removed

  VC++Files/mysqlshutdown/mysqlshutdown.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlshutdown/myshutdown.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlserver/mysqlserver.dsp
    1.4 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlmanager/mysqlmanager.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/mysqlmanager/MySqlManager.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/mysqldemb/mysqldemb.dsp
    1.4 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlcheck/mysqlcheck.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.8 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysql.dsw
    1.6 03/02/28 22:23:58 monty@narttu.mysql.fi +3 -4
    Updated VC++ files +end space removed

  VC++Files/mysql.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/myisampack/myisampack.dsp
    1.4 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/myisammrg/myisammrg.dsp
    1.4 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/myisamlog/myisamlog.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/myisamchk/myisamchk.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/myisam/myisam.dsp
    1.4 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/my_print_defaults/my_print_defaults.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/merge/merge.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/merge/merge.dsp
    1.4 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/libmysqltest/mytest.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/libmysqltest/myTest.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/libmysqld/libmysqld.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/libmysqld/examples/test_libmysqld.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +6 -6
    Updated VC++ files +end space removed

  VC++Files/libmysql/libmysql.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +1 -2
    Updated VC++ files +end space removed

  VC++Files/libmysql/libmysql.dsp
    1.8 03/02/28 22:23:58 monty@narttu.mysql.fi +31 -23
    Updated VC++ files +end space removed

  VC++Files/isamchk/isamchk.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/isam/isam.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/isam/isam.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/innobase/innobase.dsp
    1.8 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/heap/heap.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/dbug/dbug.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/dbug/dbug.dsp
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/contrib/minizip/zlibvc.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/contrib/minizip/zlibvc.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +38 -38
    Updated VC++ files +end space removed

  VC++Files/contrib/asm386/zlibvc.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/contrib/asm386/zlibvc.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +38 -38
    Updated VC++ files +end space removed

  VC++Files/comp_err/comp_err.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +6 -6
    Updated VC++ files +end space removed

  VC++Files/client/mysqlshow.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/client/mysqlimport.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/client/mysqldump.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/client/mysqlclient.dsw
    1.3 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/client/mysqlclient.dsp
    1.7 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/client/mysqlcheck.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +6 -6
    Updated VC++ files +end space removed

  VC++Files/client/mysqladmin.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/client/mysql.dsp
    1.5 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_tpcb.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_mpool.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_lock.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_env.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_btrec.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_access.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_tpcb.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_mpool.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_lock.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_env.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_btrec.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_access.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_verify.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_upgrade.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_test.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_tcl.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_static1.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_static.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_stat.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_recover.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_printlog.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_load.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_java.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +29 -29
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_dump.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_dll.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_deadlock.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_checkpoint.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_buildall.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_archive.dsp
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/Berkeley_DB.dsw
    1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/bdb/bdb.dsp
    1.4 03/02/28 22:23:57 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

ChangeSet
  1.1627 03/02/28 21:17:44 bell@sanja.is.com.ua +1 -0
  used correct function (SCRUM)

  sql/sql_show.cc
    1.102 03/02/28 21:17:38 bell@sanja.is.com.ua +2 -2
    used correct function

ChangeSet
  1.1622.1.2 03/02/28 20:00:19 monty@narttu.mysql.fi +2 -0
  merge (use local version)

  sql/slave.cc
    1.211 03/02/28 20:00:18 monty@narttu.mysql.fi +0 -1
    merge (use local version)

  BitKeeper/deleted/.del-global.h~e80d28157acfdcb5
    1.54 03/02/28 19:59:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-global.h~e80d28157acfdcb5
    1.39.9.2 03/02/28 19:59:54 monty@narttu.mysql.fi +0 -0
    Merge rename: include/global.h -> BitKeeper/deleted/.del-global.h~e80d28157acfdcb5

ChangeSet
  1.676.275.14 03/02/28 19:52:14 monty@narttu.mysql.fi +1 -0
  Always include errno.h

  include/global.h
    1.39.9.1 03/02/28 19:52:13 monty@narttu.mysql.fi +1 -0
    Portability fix
    (Using errno before including errno.h can give big problems on Linux)

ChangeSet
  1.676.275.13 03/02/28 19:50:05 monty@narttu.mysql.fi +1 -0
  LOAD DATA INFILE is not replicated by slave if replicate_*_table is set

  sql/slave.cc
    1.100.1.34 03/02/28 19:50:04 monty@narttu.mysql.fi +1 -0
    LOAD DATA INFILE is not replicated by slave if replicate_*_table is set

ChangeSet
  1.1626 03/02/28 12:47:26 lenz@mysql.com +1 -0
   - Changed version number from "4.0.12-gamma" to "4.0.12" (confirmed by
     Monty)

  configure.in
    1.265 03/02/28 12:47:25 lenz@mysql.com +1 -1
     - Changed version number from "4.0.12-gamma" to "4.0.12" (confirmed by
       Monty)

ChangeSet
  1.1622.1.1 03/02/28 12:33:10 monty@narttu.mysql.fi +1 -0
  Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

  mysql-test/Makefile.am
    1.20 03/02/28 12:33:08 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.275.12 03/02/28 12:32:37 monty@narttu.mysql.fi +1 -0
  Added copying of *.slave-mi mysql-test files

  mysql-test/Makefile.am
    1.16.1.2 03/02/28 12:32:36 monty@narttu.mysql.fi +3 -1
    Added copying of *.slave-mi mysql-test files

ChangeSet
  1.1625 03/02/27 21:29:56 bell@sanja.is.com.ua +2 -0
  postmerging fix (SCRUM)

  libmysqld/lib_vio.c
    1.14 03/02/27 21:29:55 bell@sanja.is.com.ua +1 -1
    postmerging fix

  include/violite.h
    1.28 03/02/27 21:29:55 bell@sanja.is.com.ua +2 -2
    postmerging fix

ChangeSet
  1.1624 03/02/27 20:31:54 bell@sanja.is.com.ua +3 -0
  posreview changing (SCRUM)
  
  increased compatibility
  postmerge changing

  vio/viosocket.c
    1.17 03/02/27 20:31:52 bell@sanja.is.com.ua +1 -1
    increased compatibility

  sql/sql_show.cc
    1.101 03/02/27 20:31:52 bell@sanja.is.com.ua +2 -5
    postmerge changing

  sql/sql_class.h
    1.140 03/02/27 20:31:52 bell@sanja.is.com.ua +1 -1
    increased compatibility

ChangeSet
  1.1623 03/02/27 19:38:39 bell@sanja.is.com.ua +2 -0
  merging

  sql/sql_show.cc
    1.100 03/02/27 19:38:38 bell@sanja.is.com.ua +0 -1
    merging

  sql/sql_parse.cc
    1.295 03/02/27 19:35:38 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1622 03/02/27 17:35:51 monty@narttu.mysql.fi +9 -0
  Added detection if pthread_attr_getstacksize() exists
  Fixed bug in RAND() usage in mysqlbinlog

  sql/sql_show.cc
    1.98.1.2 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -4
    Set host_or_ip for system threads (to make other code simpler)

  sql/sql_insert.cc
    1.90 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -0
    Set host_or_ip for system threads (to make other code simpler)

  sql/sql_class.cc
    1.98 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -1
    Set host_or_ip for system threads (to make other code simpler)

  sql/slave.cc
    1.210 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -1
    Set host_or_ip for system threads (to make other code simpler)

  sql/repl_failsafe.cc
    1.27 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -1
    Set host_or_ip for system threads (to make other code simpler)

  sql/mysqld.cc
    1.400 03/02/27 17:35:49 monty@narttu.mysql.fi +2 -0
    Portablity fix

  sql/log_event.cc
    1.97 03/02/27 17:35:49 monty@narttu.mysql.fi +2 -2
    Fixed bug in RAND() usage in mysqlbinlog

  include/thr_lock.h
    1.11 03/02/27 17:35:49 monty@narttu.mysql.fi +2 -2
    Fixed wrong comment

  configure.in
    1.264 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -0
    Added detection if pthread_attr_getstacksize() exists

ChangeSet
  1.1621 03/02/27 11:20:07 monty@narttu.mysql.fi +1 -0
  Add missing SIGNAL_WITH_VIO_CLOSE to fix problem with SLAVE STOP on windows

  include/config-win.h
    1.25 03/02/27 11:20:06 monty@narttu.mysql.fi +5 -0
    Add missing SIGNAL_WITH_VIO_CLOSE to fix problem with SLAVE STOP on windows

ChangeSet
  1.1620 03/02/27 02:10:19 monty@narttu.mysql.fi +4 -0
  Integer values between 9223372036854775807 and 9999999999999999999 are now
  regarded as unsigned longlongss, not as floats. This make these values work
  similar to values between 10000000000000000000 and 18446744073709551615.

  sql/sql_lex.cc
    1.39 03/02/27 02:10:18 monty@narttu.mysql.fi +1 -1
    Returns numbers between 9223372036854775807 and 9999999999999999999 as unsigned 64 bit numbers

  sql/item.h
    1.36 03/02/27 02:10:18 monty@narttu.mysql.fi +5 -0
    Mark unsigned big ints as unsigned

  mysql-test/t/bigint.test
    1.16 03/02/27 02:10:18 monty@narttu.mysql.fi +0 -6
    Fixed results for bigints

  mysql-test/r/bigint.result
    1.17 03/02/27 02:10:18 monty@narttu.mysql.fi +2 -2
    Fixed results for bigints

ChangeSet
  1.1619 03/02/27 00:06:09 monty@narttu.mysql.fi +1 -0
  Code cleanup

  sql/sql_load.cc
    1.45 03/02/27 00:06:08 monty@narttu.mysql.fi +3 -8
    Code cleanup

ChangeSet
  1.1614.1.1 03/02/26 23:35:58 monty@narttu.mysql.fi +1 -0
  Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

  sql/sql_show.cc
    1.98.1.1 03/02/26 23:35:57 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1617 03/02/26 19:52:31 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table

  sql/ha_innodb.cc
    1.156 03/02/26 19:52:23 heikki@hundin.mysql.fi +7 -1
    Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table

ChangeSet
  1.1616 03/02/26 19:31:05 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Add docs to store_lock()

  sql/ha_innodb.cc
    1.155 03/02/26 19:30:57 heikki@hundin.mysql.fi +6 -3
    Add docs to store_lock()

ChangeSet
  1.1608.1.1 03/02/26 15:28:28 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for a crashing bug with unspecified database in this  type of
  command:
  
  load  data infile 'filename' into table db.table;

  sql/sql_load.cc
    1.44 03/02/26 15:27:42 Sinisa@sinisa.nasamreza.org +9 -2
    A fix for a crashing bug with unspecified database in this  type of
    command:
    
    load  data infile 'filename' into table db.table;

ChangeSet
  1.676.275.11 03/02/26 10:16:50 monty@narttu.mysql.fi +1 -0
  Fix for SHOW TABLE STATUS with empty .frm file

  sql/sql_show.cc
    1.47.1.21 03/02/26 10:16:49 monty@narttu.mysql.fi +1 -1
    Fix for SHOW TABLE STATUS with empty .frm file

ChangeSet
  1.676.275.10 03/02/26 09:52:19 monty@narttu.mysql.fi +1 -0
  Comment column in SHOW TABLE STATUS now reports that it can
  contain NULL values (which is the case for a crashed .frm file).

  sql/sql_show.cc
    1.47.1.20 03/02/26 09:52:19 monty@narttu.mysql.fi +1 -0
    Comment column in SHOW TABLE STATUS now reports that it can
    contain NULL values (which is the case for a crashed .frm file).

ChangeSet
  1.1609.1.5 03/02/26 00:22:35 monty@narttu.mysql.fi +30 -0
  merge with 3.23 to get corrected error message files and rename of files in mysql-test

  sql/sql_class.cc
    1.97 03/02/26 00:22:33 monty@narttu.mysql.fi +0 -1
    merge with 3.23 (Keep local copy)

  sql/share/swedish/errmsg.txt
    1.53 03/02/26 00:22:33 monty@narttu.mysql.fi +1 -2
    merge with 3.23

  sql/share/estonian/errmsg.txt
    1.54 03/02/26 00:22:33 monty@narttu.mysql.fi +0 -2
    merge with 3.23

  sql/share/dutch/errmsg.txt
    1.59 03/02/26 00:22:33 monty@narttu.mysql.fi +3 -6
    merge with 3.23

  sql/share/danish/errmsg.txt
    1.52 03/02/26 00:22:33 monty@narttu.mysql.fi +1 -3
    merge with 3.23

  sql/share/czech/errmsg.txt
    1.53 03/02/26 00:22:33 monty@narttu.mysql.fi +0 -187
    merge with 3.23

  scripts/make_binary_distribution.sh
    1.49 03/02/26 00:22:33 monty@narttu.mysql.fi +1 -2
    merge with 3.23

  mysql-test/mysql-test-run.sh
    1.161 03/02/26 00:22:33 monty@narttu.mysql.fi +0 -0
    merge with 3.23

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.8 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl000015.slave-mi
    1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/ukrainian/errmsg.txt
    1.18 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.54 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.53 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.52 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.51 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.55 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.52 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.1.2.2 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  mysql-test/t/rpl000015.slave-mi
    1.1.1.2 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  sql/sql_analyse.h
    1.12 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.17 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.52 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.52 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.52 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.52 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.60 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.54 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.53 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.54 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.53 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.63 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Merge 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
    1.6 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

  innobase/ibuf/ibuf0ibuf.c
    1.14 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1609.1.4 03/02/26 00:13:18 monty@narttu.mysql.fi +6 -0
  Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS)

  netware/mysql_test_run.c
    1.2 03/02/26 00:13:17 monty@narttu.mysql.fi +1 -1
    slave-master-info.opt -> .slave-mi

  mysys/thr_alarm.c
    1.30 03/02/26 00:13:17 monty@narttu.mysql.fi +2 -0
    Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS)

  mysql-test/t/bigint.test
    1.15 03/02/26 00:13:17 monty@narttu.mysql.fi +1 -0
    New bigint test

  mysql-test/r/bigint.result
    1.16 03/02/26 00:13:17 monty@narttu.mysql.fi +3 -0
    New bigint test

ChangeSet
  1.676.275.9 03/02/26 00:04:13 monty@narttu.mysql.fi +4 -0
  change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS

  scripts/make_binary_distribution.sh
    1.29.1.8 03/02/26 00:04:05 monty@narttu.mysql.fi +1 -1
    change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS

  mysql-test/mysql-test-run.sh
    1.66.1.25 03/02/26 00:04:05 monty@narttu.mysql.fi +1 -1
    change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS

  mysql-test/t/rpl000015.slave-mi
    1.1.1.1 03/02/25 23:38:11 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.1.2.1 03/02/25 23:38:03 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi

  mysql-test/t/rpl000015-slave-master-info.opt
    1.5 03/02/25 23:37:22 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl000015.slave-mi -> mysql-test/t/rpl000015-slave-master-info.opt

  mysql-test/t/rpl_rotate_logs-slave-master-info.opt
    1.6 03/02/25 23:37:13 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.5 03/02/25 23:33:06 monty@narttu.mysql.fi +0 -0
    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
    1.4 03/02/25 23:32:50 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

ChangeSet
  1.1612 03/02/25 21:20:22 serg@serg.mysql.com +1 -0
  fixed again

  mysql-test/t/innodb_handler.test
    1.5 03/02/25 21:20:20 serg@serg.mysql.com +2 -2
    fixed again

ChangeSet
  1.1609.1.3 03/02/25 22:20:17 monty@narttu.mysql.fi +1 -0
  Portability fix

  mysql-test/t/bigint.test
    1.14 03/02/25 22:20:16 monty@narttu.mysql.fi +6 -0
    Portability fix

ChangeSet
  1.1609.1.2 03/02/25 21:44:13 monty@narttu.mysql.fi +1 -0
  Ignore some automaticly generated files

  BitKeeper/etc/ignore
    1.142 03/02/25 21:43:46 monty@narttu.mysql.fi +3 -0
    added support-files/MacOSX/StartupParameters.plist support-files/MacOSX/postinstall support-files/MacOSX/preinstall

ChangeSet
  1.1609.1.1 03/02/25 21:43:24 monty@narttu.mysql.fi +4 -0
  Portability fix for HPUX10.20

  sql/mysqld.cc
    1.399 03/02/25 21:43:08 monty@narttu.mysql.fi +5 -7
    Simple code cleanup

  mysys/my_pthread.c
    1.34 03/02/25 21:43:08 monty@narttu.mysql.fi +11 -1
    Portability fix for HPUX10.20

  include/my_pthread.h
    1.60 03/02/25 21:43:07 monty@narttu.mysql.fi +5 -0
    Portability fix for HPUX10.20

  BUILD/compile-pentium-debug-max
    1.9 03/02/25 21:43:07 monty@narttu.mysql.fi +1 -1
    Added -DBIG_TABLES

ChangeSet
  1.1607.1.1 03/02/25 20:37:49 serg@serg.mysql.com +2 -0
  fix a bug in the test

  mysql-test/t/innodb_handler.test
    1.4 03/02/25 20:37:47 serg@serg.mysql.com +4 -2
    fix a bug in the test

  mysql-test/r/innodb_handler.result
    1.4 03/02/25 20:37:47 serg@serg.mysql.com +4 -2
    fix a bug in the test

ChangeSet
  1.1609 03/02/25 15:20:07 lenz@mysql.com +4 -0
   - Heavily reworked the Do-pkg script to use functions from logger.pm
   - moved helper functions from Bootstrap script to logger.pm 

  support-files/MacOSX/postinstall.sh
    1.2 03/02/25 15:20:06 lenz@mysql.com +9 -6
     - made script more robust

  Build-tools/logger.pm
    1.2 03/02/25 15:20:06 lenz@mysql.com +56 -1
     - added functions run_command() and abort() from Bootstrap script for
       better code reusability

  Build-tools/Do-pkg
    1.2 03/02/25 15:20:06 lenz@mysql.com +109 -49
     - heavily reworked: now make use of the logger.pm helper functions
     - added new options: --dry-run, --log, --mail, --verbose

  Build-tools/Bootstrap
    1.2 03/02/25 15:20:06 lenz@mysql.com +8 -63
     - renamed logfile -> LOGFILE
     - moved functions abort() and run_command() to logger.pm for better
       reusability

ChangeSet
  1.676.1.658 03/02/25 16:09:47 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql
  into sinisa.nasamreza.org:/mnt/work/mysql

  sql/share/polish/errmsg.txt
    1.22.1.11 03/02/25 16:09:09 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1608 03/02/25 13:10:16 lenz@mysql.com +1 -0
   - bumped up version number from 4.0.11-gamma -> 4.0.12-gamma in configure.in
   - tagged ChangeSet 1.1594 as "mysql-4.0.11"

  configure.in
    1.263 03/02/25 13:10:14 lenz@mysql.com +1 -1
     - bumped up version number from 4.0.11-gamma -> 4.0.12-gamma in configure.in
     - tagged ChangeSet 1.1594 as "mysql-4.0.11"

ChangeSet
  1.676.275.8 03/02/25 13:41:08 monty@mashka.mysql.fi +22 -0
  Fixed "syntax" errors in text message files.
  Ensured that all errors messages ends with: ",

  sql/share/ukrainian/errmsg.txt
    1.1.1.6 03/02/25 13:41:07 monty@mashka.mysql.fi +1 -1
    Fixed "syntax" errors.

  sql/share/swedish/errmsg.txt
    1.23.1.12 03/02/25 13:41:07 monty@mashka.mysql.fi +7 -7
    Fixed "syntax" errors.

  sql/share/spanish/errmsg.txt
    1.23.1.11 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/slovak/errmsg.txt
    1.23.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/russian/errmsg.txt
    1.23.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/romanian/errmsg.txt
    1.21.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +1 -1
    Fixed "syntax" errors.

  sql/share/portuguese/errmsg.txt
    1.23.1.14 03/02/25 13:41:07 monty@mashka.mysql.fi +1 -1
    Fixed "syntax" errors.

  sql/share/polish/errmsg.txt
    1.22.2.1 03/02/25 13:41:07 monty@mashka.mysql.fi +5 -5
    Fixed "syntax" errors.

  sql/share/norwegian/errmsg.txt
    1.22.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +4 -4
    Fixed "syntax" errors.

  sql/share/norwegian-ny/errmsg.txt
    1.22.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +4 -4
    Fixed "syntax" errors.

  sql/share/korean/errmsg.txt
    1.22.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/japanese/errmsg.txt
    1.22.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +2 -2
    Fixed "syntax" errors.

  sql/share/italian/errmsg.txt
    1.27.1.12 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/hungarian/errmsg.txt
    1.24.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/greek/errmsg.txt
    1.23.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +2 -2
    Fixed "syntax" errors.

  sql/share/german/errmsg.txt
    1.23.1.11 03/02/25 13:41:06 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/french/errmsg.txt
    1.22.1.11 03/02/25 13:41:06 monty@mashka.mysql.fi +4 -4
    Fixed "syntax" errors.

  sql/share/estonian/errmsg.txt
    1.22.1.12 03/02/25 13:41:06 monty@mashka.mysql.fi +2 -2
    Fixed "syntax" errors.

  sql/share/english/errmsg.txt
    1.26.1.10 03/02/25 13:41:06 monty@mashka.mysql.fi +2 -2
    Fixed "syntax" errors.

  sql/share/dutch/errmsg.txt
    1.23.1.11 03/02/25 13:41:06 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/danish/errmsg.txt
    1.22.1.10 03/02/25 13:41:06 monty@mashka.mysql.fi +4 -4
    Fixed "syntax" errors.

  sql/share/czech/errmsg.txt
    1.23.1.10 03/02/25 13:41:06 monty@mashka.mysql.fi +190 -190
    Fixed new line terminations

ChangeSet
  1.676.275.7 03/02/25 11:05:07 monty@mashka.mysql.fi +1 -0
  Indentation cleanup

  sql/sql_analyse.h
    1.7.1.2 03/02/25 11:05:06 monty@mashka.mysql.fi +2 -0
    Indentation cleanup

ChangeSet
  1.1603.2.1 03/02/24 21:25:09 serg@serg.mysql.com +2 -0
  test updated

  mysql-test/t/innodb_handler.test
    1.3 03/02/24 21:25:07 serg@serg.mysql.com +5 -7
    test updated

  mysql-test/r/innodb_handler.result
    1.3 03/02/24 21:25:06 serg@serg.mysql.com +5 -4
    test updated

ChangeSet
  1.1603.1.1 03/02/24 16:57:54 jani@rhols221.adsl.netsonic.fi +1 -0
  Applied a patch which fixes a quoting problem with
  mysql_hot_copy when --checkpoint or --record-log-pos was used.

  scripts/mysqlhotcopy.sh
    1.30 03/02/24 16:57:52 jani@rhols221.adsl.netsonic.fi +16 -3
    Applied a patch which fixes a quoting problem with
    mysql_hot_copy when --checkpoint or --record-log-pos was used.

ChangeSet
  1.1605 03/02/24 16:13:17 heikki@hundin.mysql.fi +1 -0
  ut0mem.c:
    Correct printf format

  innobase/ut/ut0mem.c
    1.10 03/02/24 16:13:09 heikki@hundin.mysql.fi +1 -1
    Correct printf format

ChangeSet
  1.1604 03/02/24 16:05:54 heikki@hundin.mysql.fi +1 -0
  ut0mem.c:
    Print correct OS error number also on Windows if we run out of memory

  innobase/ut/ut0mem.c
    1.9 03/02/24 16:05:46 heikki@hundin.mysql.fi +7 -1
    Print correct OS error number also on Windows if we run out of memory

ChangeSet
  1.1600.1.1 03/02/24 11:46:07 serg@serg.mysql.com +1 -0
  allow --without-extra-charsets

  configure.in
    1.262 03/02/24 11:46:05 serg@serg.mysql.com +3 -1
    allow --without-extra-charsets

ChangeSet
  1.1602 03/02/24 11:34:41 lenz@mysql.com +1 -0
   - re-added missing reservedwords.texi (disappeared after last merge with 
     3.23.x) and removed mirrors.texi again

  Docs/Makefile.am
    1.36 03/02/24 11:34:40 lenz@mysql.com +1 -1
     - re-added missing reservedwords.texi (disappeared after last merge with 
       3.23.x) and removed mirrors.texi again

ChangeSet
  1.1601 03/02/23 04:27:03 igor@hundin.mysql.fi +2 -0
  opt_sum.cc:
    Correction for min/max optimization of queries with outer joins

  BitKeeper/etc/logging_ok
    1.272 03/02/23 04:27:02 igor@hundin.mysql.fi +1 -0
    Logging to logging@openlogging.org accepted

  sql/opt_sum.cc
    1.26 03/02/23 04:20:58 igor@hundin.mysql.fi +2 -1
    Correction for min/max optimization of queries with outer joins

ChangeSet
  1.1600 03/02/22 18:22:39 serg@serg.mysql.com +2 -0
  tests updated

  mysql-test/t/handler.test
    1.9 03/02/22 18:22:37 serg@serg.mysql.com +5 -3
    tests updated

  mysql-test/r/handler.result
    1.9 03/02/22 18:22:37 serg@serg.mysql.com +4 -1
    tests updated

ChangeSet
  1.1599 03/02/22 18:00:34 serg@serg.mysql.com +2 -0
  ALTER TABLE closes all open HANDLER's for the table in question
  fixed error handling in HANDLER ... READ FIRST

  sql/sql_table.cc
    1.149 03/02/22 18:00:32 serg@serg.mysql.com +1 -0
    ALTER TABLE closes all open HANDLER's for the table in question

  sql/sql_handler.cc
    1.29 03/02/22 18:00:32 serg@serg.mysql.com +7 -4
    fix error handling in HANDLER ... READ FIRST

ChangeSet
  1.1598 03/02/22 15:51:21 serg@serg.mysql.com +1 -0
  make myisamchk -R to work, if the table contains fulltext indexes

  myisam/myisamchk.c
    1.99 03/02/22 15:51:18 serg@serg.mysql.com +2 -2
    make myisamchk -R to work, if the table contains fulltext indexes

ChangeSet
  1.1597 03/02/22 11:44:26 serg@serg.mysql.com +1 -0
  do not accept -R (sort by index) for FULLTEXT indexes

  myisam/myisamchk.c
    1.98 03/02/22 11:44:24 serg@serg.mysql.com +7 -0
    do not accept -R (sort by index) for FULLTEXT indexes

ChangeSet
  1.1594.1.1 03/02/22 01:07:17 serg@serg.mysql.com +1 -0
  do not allow COLUMN and AFTER/FIRST in
  
  ALTER TABLE ... ADD KEY

  sql/sql_yacc.yy
    1.201 03/02/22 01:07:15 serg@serg.mysql.com +12 -3
    do not allow COLUMN and AFTER/FIRST in
    
    ALTER TABLE ... ADD KEY

ChangeSet
  1.676.275.6 03/02/21 23:11:31 heikki@hundin.mysql.fi +1 -0
  ibuf0ibuf.c:
    Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records

  innobase/ibuf/ibuf0ibuf.c
    1.9.1.3 03/02/21 23:11:10 heikki@hundin.mysql.fi +41 -2
    Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records

ChangeSet
  1.1595 03/02/21 17:42:48 lenz@mysql.com +1 -0
   - removed +DD64 compile option from the HPUX11 default CFLAGS in
     configure.in - there are 32bit installations of HPUX11 out there
     and compiling for these by manually adding +DAportable to CFLAGS
     did not work. Better add +DD64 manually, if you need it.

  configure.in
    1.261 03/02/21 17:42:46 lenz@mysql.com +2 -2
     - removed +DD64 compile option from the HPUX11 default CFLAGS in
       configure.in - there are 32bit installations of HPUX11 out there
       and compiling for these by manually adding +DAportable to CFLAGS
       did not work. Better add +DD64 manually, if you need it.

ChangeSet
  1.1594 03/02/20 15:13:47 lenz@mysql.com +1 -0
   - temporarily removed netware from AC_OUTPUT to be able to perform the
     builds and until I've found a way on how to add this conditionally

  configure.in
    1.260 03/02/20 15:13:45 lenz@mysql.com +0 -1
     - temporarily removed netware from AC_OUTPUT to be able to perform the
       builds and until I've found a way on how to add this conditionally

