1. 06 Oct, 2005 2 commits
    • unknown's avatar
      Fixed a bug in argument sending to get_one_option. · 9a64e0a7
      unknown authored
      Fixed documentation for findopt().
      Cleaned code a bit.
      
      9a64e0a7
    • unknown's avatar
      my_pthread.h: · 71b47603
      unknown authored
        Let pthread_mutex_init() macro return 0 on Windows
      mysql_priv.h:
        Return type is to be 'my_bool' for 'opt_enable_shared_memory'
      
      
      sql/mysql_priv.h:
        Return type is to be 'my_bool' for 'opt_enable_shared_memory'
      include/my_pthread.h:
        Let pthread_mutex_init() macro return 0 on Windows
      71b47603
  2. 05 Oct, 2005 9 commits
  3. 04 Oct, 2005 16 commits
    • unknown's avatar
      Make mysql_fix_privilege_tables.sh not dependent on the current directory. · eedae896
      unknown authored
      
      scripts/mysql_fix_privilege_tables.sh:
        Make the script not dependent on the current directory.
      eedae896
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2b972093
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      2b972093
    • unknown's avatar
      Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release · 14f24b5e
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      14f24b5e
    • unknown's avatar
      innodb.result: · 8a1490ed
      unknown authored
        somehow it didn't get into the previous changeset
      
      
      mysql-test/r/innodb.result:
        somehow it didn't get into the previous changeset
      8a1490ed
    • unknown's avatar
      Changed __USE_XOPEN to _XOPEN_SOURCE and got rid of · 60ebe17b
      unknown authored
      some extra code.
      
      60ebe17b
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e18d9de
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
      
      
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      0e18d9de
    • unknown's avatar
      Fixed several boolean type options used in my_long_options[]. · ba6ad9fe
      unknown authored
      Some options were declared as 'bool', but since those are being
      handled in my_getopt.c, bool can be machine dependent. To make
      sure it works in all circumstances, the type should be my_bool
      for C (not C++) programs.
      
      
      sql/mysql_priv.h:
        Fixed some bools to my_bools.
      sql/mysqld.cc:
        Changed several bools to my_bools.
      sql/slave.cc:
        Changed bool to my_bool.
      sql/slave.h:
        Changed bool to my_bool.
      ba6ad9fe
    • unknown's avatar
      Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release · 6f9ad424
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/sql_table.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      6f9ad424
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 48329942
      unknown authored
      into  zim.(none):/home/brian/mysql/fix-5.0
      
      48329942
    • unknown's avatar
      Some fixes including implicit declaration of a function, · 71bf62c7
      unknown authored
      using wrong type in assignment etc.
      
      
      cmd-line-utils/readline/complete.c:
        Fixed problem with implicitely defining wcwidth() in case when
        compiling with icc.
      cmd-line-utils/readline/display.c:
        Fixed problem with implicitely defining wcwidth() in case when
        compiling with icc.
      cmd-line-utils/readline/mbutil.c:
        Fixed problem with implicitely defining wcwidth() in case when
        compiling with icc.
      server-tools/instance-manager/protocol.cc:
        Fixed some types from int to char. Made ERROR_PACKET_CODE
        static global variable in this file.
      sql/log.cc:
        Removed warning of unused goto when not in debug mode.
      71bf62c7
    • unknown's avatar
      sql_table.cc, table.cc, table.h: · 266462f8
      unknown authored
        fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
        bug#13710
      
      
      sql/table.h:
        fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
        bug#13710
      sql/table.cc:
        fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
        bug#13710
      sql/sql_table.cc:
        fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
        bug#13710
      266462f8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fe56872e
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      fe56872e
    • unknown's avatar
      Move -ansi from global_warnings to cxx_warnings · 0710c142
      unknown authored
      0710c142
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 25fb24e4
      unknown authored
      into  zim.(none):/home/brian/mysql/fix-5.0
      
      
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_berkeley.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      25fb24e4
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 12416ec9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      sql/sql_base.cc:
        Auto merged
      12416ec9
    • unknown's avatar
      Final patch for 5.0 for simplifying storage engine code. We now have just one... · dd0e007e
      unknown authored
      Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers.
      May changes were to simplify storage engine setup and support for legacy call to show storage engines.
      
      
      mysql-test/r/ps_1general.result:
        Fixed test results for new listing order
      sql/examples/ha_tina.cc:
        Removed dead code
      sql/examples/ha_tina.h:
        Removed dead code
      sql/ha_archive.cc:
        Capitalized sotrage engine name and moved disabled code.
      sql/ha_berkeley.cc:
        Moved deisabled code
      sql/ha_federated.cc:
        Removed disabled code
      sql/ha_innodb.cc:
        Removed disabled message
      sql/ha_ndbcluster.cc:
        Removed disabled message
      sql/handler.cc:
        Added in legacy support for sotrage engine listing (ala Serg's request). Removed handlertons variables and we now have simplified ha_init code.
      sql/handler.h:
        No longer need handlertons array.
      dd0e007e
  4. 03 Oct, 2005 13 commits
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 5672f913
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-bug-13410
      
      
      sql/item.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      5672f913
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c4f46a9c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/handler.h:
        Auto merged
      c4f46a9c
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e62189b
      unknown authored
      into  selena.:H:/MYSQL/src/tmp-mysql-5.0
      
      0e62189b
    • unknown's avatar
      Unset EOLN_NATIVE flag for proper tests execution under win32. · 6fa43f71
      unknown authored
      
      mysql-test/include/check_var_limit.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_big5.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_compress.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_crypt.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_outfile.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_query_cache.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_tis620.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_ucs2.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_ujis.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/not_embedded.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/system_db_struct.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/test_outfile.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/r/greedy_optimizer.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_bdb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_innodb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_innodb2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_ror.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_ror_cpk.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/join_nested.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rowid_order_bdb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rowid_order_innodb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_session_var.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp-error.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp-security.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sum_distinct.result:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/des_key_file:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/init_file.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata1.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata2.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata3.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata4.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/rpl_loaddata.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/rpl_loaddata2.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/warnings_loaddata.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/t/greedy_optimizer.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_bdb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_innodb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_innodb2.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_ror.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_ror_cpk.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/join_nested.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rowid_order_bdb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rowid_order_innodb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_session_var.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp-error.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp-security.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sum_distinct.test:
        Turn off EOLN_NATIVE flag
      6fa43f71
    • unknown's avatar
      Fix -ansi -pedantic compilation failure. · 814fc33e
      unknown authored
      814fc33e
    • unknown's avatar
      ndb - · 603c0fb9
      unknown authored
        fix solaris problem
        (dont print null)
      
      
      ndb/src/mgmsrv/Services.cpp:
        Dont print null address
      603c0fb9
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3ebf8149
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      3ebf8149
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · ee437eb7
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
      
      ee437eb7
    • unknown's avatar
      ndb - mysql-test-run ndb_config · 385e47db
      unknown authored
        Fix 32/64 bit insecure code 
      
      
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Fix 32/64 bit insecure/useless code
      385e47db
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ed6d4d9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      sql/handler.h:
        Auto merged
      6ed6d4d9
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · edb90dcd
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
      
      edb90dcd
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 27cc798d
      unknown authored
      into  zim.(none):/home/brian/mysql/fix-5.0
      
      
      sql/ha_blackhole.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/ha_archive.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/ha_federated.cc:
        Merge fix.
      27cc798d
    • unknown's avatar
      Next big patch for loadable storage engines! · 1cb47ed1
      unknown authored
      Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail. 
      
      
      sql/examples/ha_archive.cc:
        Modifications for new ha_init code. The init method now checks for errors and will not start up if the errors occur.
      sql/examples/ha_archive.h:
        Change for new init method.
      sql/examples/ha_example.cc:
        New handlerton pieces.
      sql/examples/ha_tina.cc:
        New handlerton pieces.
      sql/ha_berkeley.cc:
        New handlerton pieces, plus changes for ha_init changes. I'm not happy with our current "skip" setup.
      sql/ha_berkeley.h:
        Change in init return.
      sql/ha_blackhole.cc:
        Changes for new handlerton pieces.
      sql/ha_federated.cc:
        Changes for new handlerton and true cleanup code.
      sql/ha_heap.cc:
        Changes for new handlerton returns.
      sql/ha_innodb.cc:
        Changes for handlerton code.
      sql/ha_innodb.h:
        Change in init.
      sql/ha_myisam.cc:
        Changes for additional handlerton bits.
      sql/ha_myisammrg.cc:
        Changes for  new handlerton bits.
      sql/ha_ndbcluster.cc:
        Changes for new handlerton bits.
      sql/ha_ndbcluster.h:
        Changes for handlerton bits.
      sql/handler.cc:
        Changes for ditching show_table_type_st types, and collapsing it into a handlerton array. The ha_init now just loops through all handlers to init (much cleaner...). handlertons and sys_table_types should be merged next.
      sql/handler.h:
        Additions for sys_table_types
      sql/log.cc:
        Clean up of binlog for changes in handlerton
      sql/mysql_priv.h:
        Removed unneeded define for binlog_init
      sql/sql_show.cc:
        Changes for change in handlerton to sys_table_types
      1cb47ed1