1. 23 Feb, 2005 1 commit
    • unknown's avatar
      WL #2094 Federated Storage Handler · aec30267
      unknown authored
      This is the first changeset of suggested changes recommended in Kostja's 
      review of my patch, 1.1846, which includes only functionality changes. 
      Style changes/Documentation patch to follow.
      
      
      include/mysql.h:
        removed declaration of cli_fetch_lengths per Kostja's suggestion
      libmysql/libmysql.c:
        moved mysql_fetch_lengths to client.c (for server to access) per Kostja's
        suggestion
      sql-common/client.c:
        added back 'static' to function definition, added mysql_fetch_lengths
      sql/ha_federated.cc:
        changed to use defines as opposed to hardcoded values
      sql/ha_federated.h:
        took out duplicate table_flag, fixed a resolve mistake
      aec30267
  2. 22 Feb, 2005 32 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 65492347
      unknown authored
      into krsna.patg.net:/home/patg/mysql-5.0
      
      
      sql/handler.cc:
        Auto merged
      65492347
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bf46e486
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      bf46e486
    • unknown's avatar
      After merge fixes · 59a39534
      unknown authored
      
      mysql-test/r/strict.result:
        Update tests after merge
      mysql-test/t/strict.test:
        Update tests after merge (We can't handle 2.2E-307) anymore as this is out of range with the new method to calculate double
      sql/item_sum.h:
        After merge fix
        use my_strtoll10 instead of my_strtonll
      59a39534
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 61f2abba
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      61f2abba
    • unknown's avatar
      Post review coding style fixes. · 965f2b4d
      unknown authored
      965f2b4d
    • unknown's avatar
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3d9ee100
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-build
      
      
      3d9ee100
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · b60d8e7b
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      b60d8e7b
    • unknown's avatar
      Fix for BUG#8578 "Test case 'index_merge_ror' fails on SGI irix" · db895ce7
      unknown authored
        Take into account that bitmap_is_set() may return any non-zero zero value when the bit is set.
      
      
      db895ce7
    • unknown's avatar
      merged · a5a91280
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      a5a91280
    • unknown's avatar
      compatibility fixes, crashing tests · 7caef7f4
      unknown authored
      
      include/my_sys.h:
        sol9x86, sunfire100b, qnx compatibility
      mysql-test/t/rpl_rotate_logs.test:
        fix the test
      sql/ha_innodb.cc:
        don't bother
      sql/handler.cc:
        few more ways to crash mysqld :)
      sql/handler.h:
        gdb/safemalloc workaround
      sql/log.cc:
        rotate a binlog on heuristic recover
      sql/mysqld.cc:
        rotate a binlog on heuristic recover
      7caef7f4
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3bd16c79
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      3bd16c79
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bc2a2293
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      bc2a2293
    • unknown's avatar
      trx0trx.c: · 10ffa887
      unknown authored
        Disable the XA code in InnoDB crash recovery; when Jan and Sergei want to test XA, they should revert this patch
      
      
      innobase/trx/trx0trx.c:
        Disable the XA code in crash recovery; when Jan and Sergei want to test XA, they should revert this patch
      10ffa887
    • unknown's avatar
      Merge with 4.1 · ce99d443
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysql.cc:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      include/m_string.h:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/t/user_var.test:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      strings/ctype-utf8.c:
        Auto merged
      libmysql/libmysql.c:
        ul
      mysql-test/r/ps_1general.result:
        Merge
      mysql-test/t/derived.test:
        Merge
      mysql-test/t/ps_1general.test:
        Merge
      mysql-test/t/type_float.test:
        Merge
      sql/field.cc:
        ul
      sql/item.cc:
        ul
      sql/item.h:
        ul
      sql/item_func.h:
        ul
      sql/item_strfunc.cc:
        ul
      sql/item_sum.cc:
        ul
      sql/item_sum.h:
        ul
      sql/procedure.h:
        ul
      sql/sql_derived.cc:
        Trivial merge
      sql/sql_parse.cc:
        ul
      sql/sql_update.cc:
        Trivial merge
      strings/strtod.c:
        Use updated code from 4.1
        This is bascily same code as we had before or 5.0, execpt that we now have higher accuracy for floating points value that are integers (like 123.45E+02)
      ce99d443
    • unknown's avatar
      Fixed a bug on InnoDB X/Open XA prepare. · 59554966
      unknown authored
      59554966
    • unknown's avatar
      Fix errors in my last changeset · 2ae6eb09
      unknown authored
      2ae6eb09
    • unknown's avatar
      Clean up prints in innodb_xa_prepare. · acaa20e2
      unknown authored
      acaa20e2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 1c172c3b
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      1c172c3b
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8b84cb93
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      8b84cb93
    • unknown's avatar
      0865c81c
    • unknown's avatar
      Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · fe471dfd
      unknown authored
      into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
      
      
      fe471dfd
    • unknown's avatar
      Fixed compiler warnings · 6965e72b
      unknown authored
      Fixed failing myisam.test and rpl_rotate_logs.test on some configurations
      
      
      mysql-test/r/myisam.result:
        Portability fix
      mysql-test/r/rpl_rotate_logs.result:
        Portability fix
      mysql-test/t/myisam.test:
        Depending on if you compiled with -DHAVE_RAID or not, you could get different errors for this test
      mysql-test/t/rpl_rotate_logs.test:
        Portability fix
      sql/ha_innodb.cc:
        Fixed compiler warnings
      6965e72b
    • unknown's avatar
      A user variable are now always have IMPLICIT coercibility, · 2fb807d1
      unknown authored
      independently from the expression it is initialized from.
      In other words, this change treats a user variable like
      a table with one column and one record. Discussed with 
      PeterG, Serg and Lars. This change also simplifies replication
      allowing not to replicate variables' coercibility.
      
      
      mysql-test/r/user_var.result:
        Test changes accordintly
      mysql-test/t/user_var.test:
        Test changes accordintly
      2fb807d1
    • unknown's avatar
      Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · 56679769
      unknown authored
      into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      56679769
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7e028f99
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/field.cc:
        Auto merged
      7e028f99
    • unknown's avatar
      Backport my_strntod() from 5.0 · cb8d9c3a
      unknown authored
      Change string->float conversion to delay division as long as possible.
      This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
      
      
      
      
      client/mysql.cc:
        Fix wront usage of charset (found during review of pushed code)
      include/m_string.h:
        Backported my_strtod() from 5.0
      mysql-test/mysql-test-run.sh:
        Run also mysql_client_test with --debug
      mysql-test/r/ps_1general.result:
        Safety fix (if mysql_client_test.test fails)
      mysql-test/r/type_float.result:
        More test
      mysql-test/t/mysql_client_test.test:
        Comments for what to do if this test fails
      mysql-test/t/ps_1general.test:
        Safety fix (if mysql_client_test.test fails)
      mysql-test/t/type_float.test:
        More test to better test new strtod() function
        Test also bug #7740 (wrong comparsion between integer and float-in-integer-range)
      sql/field.cc:
        Backport my_strntod() from 5.0
      sql/item.cc:
        Backport my_strntod() from 5.0
      sql/item.h:
        Backport my_strntod() from 5.0
      sql/item_func.h:
        Backport my_strntod() from 5.0
      sql/item_strfunc.cc:
        Backport my_strntod() from 5.0
      sql/item_sum.cc:
        Backport my_strntod() from 5.0
      sql/item_sum.h:
        Backport my_strntod() from 5.0
      sql/procedure.h:
        Backport my_strntod() from 5.0
      strings/ctype-simple.c:
        Backport my_strntod() from 5.0
      strings/ctype-ucs2.c:
        Backport my_strntod() from 5.0
      strings/strtod.c:
        Backport my_strntod() from 5.0
        Change conversion to delay division as long as possible.
        This gives us more exact integer-> float conversion for numbers of type '123.45E+02'
      cb8d9c3a
    • unknown's avatar
      Fix name of ndb-cache-check-time · f7c60b9f
      unknown authored
      
      sql/mysqld.cc:
        Change _ to - for ndb-cache-check-time variable
      f7c60b9f
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/fix · 8094ac95
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      8094ac95
    • unknown's avatar
      wl1292 - ndb autotest scripts · 029f10dd
      unknown authored
        split into script/conf for easier deployment
      
      
      029f10dd
    • unknown's avatar
      ctype_latin1.result, ctype_latin1.test, charset.c: · 14707d71
      unknown authored
        Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
      
      
      mysys/charset.c:
        Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
      mysql-test/t/ctype_latin1.test:
        Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
      mysql-test/r/ctype_latin1.result:
        Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
      14707d71
    • unknown's avatar
      field.cc: · 1329f063
      unknown authored
        optimize test_if_minus() when not UCS2 support is compiled.
      
      
      sql/field.cc:
        optimize test_if_minus() when not UCS2 support is compiled.
      1329f063
  3. 21 Feb, 2005 7 commits