1. 28 Feb, 2008 3 commits
  2. 27 Feb, 2008 2 commits
    • unknown's avatar
      Merge alf.(none):/src/macro_bugs/my50-macro_bugs · 209d9106
      unknown authored
      into  alf.(none):/src/macro_bugs/my51-macro_bugs
      
      
      include/my_global.h:
        Auto merged
      CMakeLists.txt:
        SCCS merged
      include/config-win.h:
        SCCS merged
      209d9106
    • unknown's avatar
      Bug #23839 Multiple declarations of macros · ed4578c0
      unknown authored
      - Remove duplicate macro defintions.
      
      
      CMakeLists.txt:
        Bug #23839 Multiple declarations of macros
        - Make sure _WIN64 is defined for proper Intellisense functionality.
      include/config-win.h:
        Bug #23839 Multiple declarations of macros
        - Remove extra definitions.  Use the my_global.h defines instead.
      include/my_global.h:
        Bug #23839 Multiple declarations of macros
        - Slight change to maintain current definitions for Windows.
      ed4578c0
  3. 26 Feb, 2008 5 commits
    • unknown's avatar
      ha_ndbcluster.m4: · e45057ea
      unknown authored
        Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric
      
      
      config/ac-macros/ha_ndbcluster.m4:
        Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric
      e45057ea
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/build/mysql-5.0-build · 11135184
      unknown authored
      into  mysql.com:/home/kent/bk/build/mysql-5.1-build
      
      
      config/ac-macros/misc.m4:
        Auto merged
      configure.in:
        Auto merged
      BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
        Auto merged
      storage/ndb/src/common/util/SocketServer.cpp:
        Auto merged
      11135184
    • unknown's avatar
      Makefile.am, Info.plist.sh: · 1aaa63aa
      unknown authored
        Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
      misc.m4, character_sets.m4, openssl.m4:
        Removed unneded semicolon
      
      
      config/ac-macros/character_sets.m4:
        Removed unneded semicolon
      config/ac-macros/misc.m4:
        Removed unneded semicolon
      config/ac-macros/openssl.m4:
        Removed unneded semicolon
      support-files/MacOSX/Info.plist.sh:
        Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
      support-files/MacOSX/Makefile.am:
        Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
      1aaa63aa
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/build/mysql-4.1-build · 720b3d15
      unknown authored
      into  mysql.com:/home/kent/bk/build/mysql-5.0-build
      
      
      ndb/src/common/util/SocketServer.cpp:
        Auto merged
      720b3d15
    • unknown's avatar
      configure.in: · b93e09a2
      unknown authored
        Corrected calculation of version id, incorrect last two digits if < 10
        Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
        RPM spec file
        Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
        Added clear doc how the different version variables differ
      SocketServer.cpp:
        Corrected typo in debug error message
      
      
      ndb/src/common/util/SocketServer.cpp:
        Corrected typo in debug error message
      configure.in:
        Corrected calculation of version id, incorrect last two digits if < 10
        Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
        RPM spec file
        Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
        Added clear doc how the different version variables differ
      b93e09a2
  4. 23 Feb, 2008 3 commits
  5. 22 Feb, 2008 11 commits
    • unknown's avatar
      Bug #34053: normal users can enable innodb_monitor logging · 482d6008
      unknown authored
      The check_global_access() function was made available to InnoDB, but
      was not defined in the embedded server library.  InnoDB, as a plugin,
      is not recompiled when the embedded server is built.  This caused a
      link failure when compiling applications which use the embedded server.
      
      The fix here is to always define check_global_access() externally; in
      the embedded server case, it is defined to just return OK.
      
      Also, don't run the test case for this bug in embedded server.
      
      
      mysql-test/t/innodb_bug34053.test:
        Disable this test on embedded server - it tests privilege
        checks which are not in place there.
      sql/mysql_priv.h:
        Since check_global_access() may be used from some storage engine plugins
        (InnoDB, currently), and the plugins are not recompiled for the embedded
        server, it must be defined externally even for NO_EMBEDDED_ACCESS_CHECKS.
      sql/sql_parse.cc:
        Since check_global_access() may be used from some storage engine plugins
        (InnoDB, currently), and the plugins are not recompiled for the embedded
        server, it must be defined externally even for NO_EMBEDDED_ACCESS_CHECKS.
      482d6008
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-build · d7cf77ee
      unknown authored
      into  hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
      
      
      d7cf77ee
    • unknown's avatar
      Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · aa8a5539
      unknown authored
      into  hh-nb.hungers:/work/merge/mysql-5.1-build
      
      
      aa8a5539
    • unknown's avatar
      Inserted changes from the review of bug#32664. · ca508c8f
      unknown authored
      ca508c8f
    • unknown's avatar
      Merge hh-nb.hungers:/work/merge/mysql-5.1-build · d2c34ded
      unknown authored
      into  hh-nb.hungers:/work/merge/mysql-5.1-bug32664
      
      
      d2c34ded
    • unknown's avatar
      mysql-test/mysql-test-run.pl · d41af7ad
      unknown authored
          Disable extra team trees.
          Temporary fix for entry 34761 in the bugs DB.
          (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)
      
      
      mysql-test/mysql-test-run.pl:
        Disable extra team trees.
        Temporary fix for entry 34761 in the bugs DB.
        (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)
      d41af7ad
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · f9789423
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        Auto merged
      f9789423
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 1bee6a3c
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        Auto merged
      1bee6a3c
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 50ba314c
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      extra/yassl/src/handshake.cpp:
        Auto merged
      extra/yassl/src/template_instnt.cpp:
        Auto merged
      extra/yassl/src/yassl_imp.cpp:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      storage/ndb/src/common/util/OutputStream.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        Auto merged
      storage/ndb/tools/waiter.cpp:
        Auto merged
      50ba314c
    • unknown's avatar
      5bb60f8a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build · a7341383
      unknown authored
      into  alf.(none):/src/mysql-5.1-build_31929
      
      
      sql/CMakeLists.txt:
        Auto merged
      storage/myisam/CMakeLists.txt:
        Auto merged
      a7341383
  6. 21 Feb, 2008 5 commits
  7. 20 Feb, 2008 2 commits
  8. 19 Feb, 2008 7 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/inno/feb18/51 · 3b2aea38
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
      
      
      3b2aea38
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · ded39d5a
      unknown authored
      into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      ded39d5a
    • unknown's avatar
      fixes for build failures due to my yesterday's changeset forbidding · 205d448b
      unknown authored
      bool in C.
      
      
      client/get_password.c:
        fix for build failure
      include/thr_alarm.h:
        fix for build failure
      libmysql/dll.c:
        fix for build failure
      libmysql/get_password.c:
        fix for build failure
      mysys/thr_alarm.c:
        fix for build failure
      205d448b
    • unknown's avatar
      Applied InnoDB snapshot innodb-5.1-ss2298 · 4b25d5b1
      unknown authored
      Fixes the following bugs:
      
      - Bug #33349: possible race condition revolving around data dictionary and repartitioning
        Introduce retry/sleep logic as a workaround for a transient bug
        where ::open fails for partitioned tables randomly if we are using
        one file per table.
      
      - Bug #34053: normal users can enable innodb_monitor logging
        In CREATE TABLE and DROP TABLE check whether the table in question is one
        of the magic innodb_monitor tables and whether the user has enough rights
        to mess with it before doing anything else.
      
      - Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
      - Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
      
      - Bug #30930: Add auxiliary function to retrieve THD::thread_id
        Add thd_get_thread_id() function.  Also make check_global_access() function
        visible to InnoDB under INNODB_COMPATIBILITY_HOOKS #define.
      
      
      include/mysql/plugin.h:
        Add thd_get_thread_id() accessor function
      mysql-test/r/innodb.result:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2261:
        branches/5.1: Merge a change from MySQL AB:
        
        ChangeSet@2007-10-13 15:49:42+03:00, aelkin@koti.dsl.inet.fi
        
        Bug #29136 erred multi-delete on trans table does not rollback the statement
        
        innodb.test, innodb.result: trans table specific test added
      mysql-test/t/innodb.test:
        Applied InnoDB snapshot innodb-5.1-ss2298
      sql/mysql_priv.h:
        Make check_global_access() declaration available if when
        INNODB_COMPATIBILITY_HOOKS is defined.
      sql/sql_class.cc:
        Add thd_get_thread_id() accessor function.
        
        Add 'extern "C"' to definition for thd_get_xid().  Not strictly
        needed, but in keeping with our coding style.
      storage/innobase/btr/btr0cur.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2295:
        branches/5.1:
        
        Merge r2294 from branches/5.0:
        
        Fix typo and add comma in comment.
      storage/innobase/handler/ha_innodb.cc:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        - But remove the declaration of check_global_access() from ha_innodb.cc,
          because it is now visible in mysql_priv.h under INNODB_COMPATIBILITY_HOOKS
        
        Revision r2270:
        branches/5.1:
        
        Rename the user visible parameter innodb-use-adaptive-hash-indexes to
        innodb-adaptive-hash-index so that it is in sync with MySQL 5.0.
        
        Suggested by:	Heikki
        Approved by:	Heikki
        
        
        Revision r2236:
        branches/5.1: bug#33349
        
        Introduce retry/sleep logic as a workaround for a transient bug
        where ::open fails for partitioned tables randomly if we are using
        one file per table.
        
        
        Reviewed by: Heikki
        
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
        
        
        Revision r2246:
        branches/5.1:
        
        Fix formatting of the autoinc-lock-mode command line parameter.
        
        Old view (./mysqld --help --verbose):
        
          --innodb-autoinc-lock-mode=#
                              The AUTOINC lock modes supported by InnoDB:
          0 => Old
                              style AUTOINC locking (for backward compatibility)
          1 =>
                              New style AUTOINC locking
          2 => No AUTOINC locking
                              (unsafe for SBR)
        
        New view:
        
          --innodb-autoinc-lock-mode=#
                              The AUTOINC lock modes supported by InnoDB:
                              0 => Old style AUTOINC locking (for backward
                              compatibility)
                              1 => New style AUTOINC locking
                              2 => No AUTOINC locking (unsafe for SBR)
        
        Looks like these strings are "automatically" wrapped by MySQL in the
        following way:
        * newlines (\n) in the string are ignored
        * newline separator (\n) is inserted every 57 or so characters.
        * lots of white space is appended to each inserted new line.
        
        Approved by:	Heikki
      storage/innobase/include/os0sync.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/read0read.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2188:
        branches/5.1: Remove unused field can_be_too_old from read_view_struct.
      storage/innobase/include/row0mysql.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
        
        
        Revision r2272:
        branches/5.1:
        
        Fix typo in comment.
      storage/innobase/include/sync0arr.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/sync0rw.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/sync0rw.ic:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/sync0sync.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/sync0sync.ic:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/os/os0sync.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/read/read0read.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2188:
        branches/5.1: Remove unused field can_be_too_old from read_view_struct.
      storage/innobase/row/row0mysql.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
        
        
        Revision r2272:
        branches/5.1:
        
        Fix typo in comment.
      storage/innobase/srv/srv0srv.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/sync/sync0arr.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/sync/sync0rw.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/sync/sync0sync.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      mysql-test/r/innodb_bug34053.result:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
      mysql-test/t/innodb_bug34053.test:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
      4b25d5b1
    • unknown's avatar
      Post-merge fix · 8b91756b
      unknown authored
      8b91756b
    • unknown's avatar
      Merge wva.:C:/bk/bug31745_2/my51_31754_2/..\my50-bug31745_2 · 13791914
      unknown authored
      into  wva.:C:/bk/bug31745_2/my51_31754_2
      
      
      sql/CMakeLists.txt:
        Auto merged
      sql/stacktrace.c:
        Auto merged
      sql/sql_parse.cc:
        merge.
      sql/mysqld.cc:
        merge
      sql/stacktrace.h:
        merge
      13791914
    • unknown's avatar
      Bug#31745 - crash handler does not work on Windows · 721d2412
      unknown authored
      - Replace per-thread signal()'s with  SetUnhandledExceptionFilter(). 
        The only remaining signal() is for SIGABRT (default abort()
        handler in VS2005 is broken, i.e removes user exception filter)
      - remove MessageBox()'es  from error handling code
      - Windows port for print_stacktrace() and write_core() 
      - Cleanup, removed some unused functions
      
      
      sql/CMakeLists.txt:
        Implement stack tracing on and generating crash dumps on Windows
      sql/mysqld.cc:
        Correct signal handling on Windows. 
        - For console events, like CTRL-C use SetConsoleCtrlHandler
        - For exceptions like access violation, use SetUnhandledExceptionFilter
        - For SIGABRT generate exception via __debugbreak() intrinsic
          if built with VS2005 and later , since default SIGABRT handler 
          replaces unhandled exception filter specified by user
        - make provisions to debug exception filter, as it is not trivial 
        (should be compiled with /DDEBUG_UNHANDLED_EXCEPTION_FILTER)
      sql/sql_parse.cc:
        Remove message box from windows signal handler.
        The only thread specific handler left is for SIGABRT,
        which is broken on VS2005 and later (user specified unhandled exception 
        filter gets overwritten)
      sql/stacktrace.c:
        Stack tracing and generating crash dumps on Windows
      sql/stacktrace.h:
        Implement print_stacktrace and write_core on Windows
      721d2412
  9. 18 Feb, 2008 2 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build · ae25da10
      unknown authored
      into  gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
      
      
      client/mysqltest.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      ae25da10
    • unknown's avatar
      Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> · 85213f62
      unknown authored
      value" error even though the value was correct): a C function in my_getopt.c
      was taking bool* in parameter and was called from C++ sql_plugin.cc,
      but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
      mismatches. Fixed, all other occurences of bool in C are removed, future
      ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).
      
      
      client/mysqldump.c:
        my_bool for C
      client/mysqltest.c:
        my_bool for C
      extra/replace.c:
        my_bool for C
      include/my_getopt.h:
        my_bool for C
      include/my_global.h:
        Prevent people from using bool in C, it causes real bugs.
      include/my_sys.h:
        my_bool for C
      include/my_time.h:
        my_bool for C
      include/thr_lock.h:
        my_bool for C
      libmysql/libmysql.c:
        my_bool for C
      mysys/charset.c:
        my_bool for C
      mysys/my_getopt.c:
        my_bool for C
      mysys/queues.c:
        my_bool for C
      mysys/thr_lock.c:
        my_bool for C
      regex/reginit.c:
        my_bool for C
      sql/set_var.cc:
        C functions use my_bool so we must use my_bool too.
      sql/sql_plugin.cc:
        C functions use my_bool so we must use my_bool too.
        This fixes a real observed bug of Maria, because on some Mac OS X,
        sizeof(bool) is 1 in C and 4 in C++, so the bool* does wrong.
        Removing useless line.
      storage/heap/hp_update.c:
        my_bool for C
      storage/myisam/mi_check.c:
        my_bool for C
      storage/myisam/mi_dynrec.c:
        my_bool for C
      storage/myisam/mi_search.c:
        my_bool for C
      storage/myisam/mi_update.c:
        my_bool for C
      storage/myisam/mi_write.c:
        my_bool for C
      storage/myisam/myisamdef.h:
        my_bool for C
      storage/myisam/myisamlog.c:
        my_bool for C
      storage/myisam/myisampack.c:
        my_bool for C
      tests/mysql_client_test.c:
        my_bool for C
      unittest/mysys/bitmap-t.c:
        my_bool for C
      vio/viosslfactories.c:
        my_bool for C
      85213f62