1. 07 Jun, 2003 1 commit
  2. 02 Jun, 2003 1 commit
  3. 29 May, 2003 2 commits
    • unknown's avatar
      Reviewed Novell-supplied patch for 5.0 tree · de223659
      unknown authored
      
      configure.in:
        Can't put this in yet because of 'make dist'
      de223659
    • unknown's avatar
      rlyon-5.0.0-alpha.patch · c560a02d
      unknown authored
      
      client/mysql.cc:
        Import patch rlyon-5.0.0-alpha.patch
      configure.in:
        Import patch rlyon-5.0.0-alpha.patch
      include/config-netware.h:
        Import patch rlyon-5.0.0-alpha.patch
      include/my_global.h:
        Import patch rlyon-5.0.0-alpha.patch
      include/my_pthread.h:
        Import patch rlyon-5.0.0-alpha.patch
      mysys/my_pthread.c:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/compile-AUTOTOOLS:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/compile-linux-tools:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/compile-netware-END:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/compile-netware-START:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/compile-netware-all:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/compile-netware-debug:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/compile-netware-standard:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/mwasmnlm:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/mwccnlm:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/mwenv:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/mwldnlm:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/nwbootstrap:
        Import patch rlyon-5.0.0-alpha.patch
      netware/Makefile.am:
        Import patch rlyon-5.0.0-alpha.patch
      netware/mysql_test_run.c:
        Import patch rlyon-5.0.0-alpha.patch
      scripts/make_binary_distribution.sh:
        Import patch rlyon-5.0.0-alpha.patch
      sql/mysqld.cc:
        Import patch rlyon-5.0.0-alpha.patch
      sql/slave.cc:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/compile-netware-src:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/cron-build:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/crontab:
        Import patch rlyon-5.0.0-alpha.patch
      netware/BUILD/knetware.imp:
        Import patch rlyon-5.0.0-alpha.patch
      c560a02d
  4. 23 May, 2003 1 commit
    • unknown's avatar
      Adopt SP stuff to the new lex pointer. · 8ea9613e
      unknown authored
      
      mysql-test/r/sp.result:
        New test (of more call levels).
      mysql-test/t/sp.test:
        New test (of more call levels).
      sql/mysql_priv.h:
        SPs wants to init lex only.
      sql/sp.cc:
        Restore lex pointer (and fixed memory leak).
      sql/sp_head.cc:
        lex is now a pointer, so reset things the right way.
      sql/sp_head.h:
        lex is now a pointer.
      sql/sql_lex.h:
        SPs wants to init lex only.
      sql/sql_parse.cc:
        SPs wants to init lex only.
      sql/sql_prepare.cc:
        Restore lex pointer.
      8ea9613e
  5. 14 May, 2003 1 commit
  6. 12 May, 2003 1 commit
    • unknown's avatar
      Task #627 : user variables' names are now case-insensitive : · ab7b3328
      unknown authored
      @test=@"tEsT"=@`teST` etc. Tests updated.
      Note that the patch to sql_class.cc does not use HASH_CASE_INSENSITIVE as did the one which I sent for review. This is because meanwhile HASH_CASE_INSENSITIVE has disappeared (since cset 1.1504.1.6).
      
      
      mysql-test/r/variables.result:
        updated test
      mysql-test/t/variables.test:
        updated test
      sql/sql_class.cc:
        Task #627 : user variables' names are now case-insensitive :
        @test=@"tEsT"=@`teST` etc.
      ab7b3328
  7. 06 May, 2003 1 commit
  8. 05 May, 2003 1 commit
  9. 30 Apr, 2003 2 commits
  10. 29 Apr, 2003 3 commits
    • unknown's avatar
      One final post-merge fix. · aa1720f3
      unknown authored
      aa1720f3
    • unknown's avatar
      Post-merge fix. · 16a751cc
      unknown authored
      16a751cc
    • unknown's avatar
      Merged 4.1 to 5.0. · 3f253296
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/records.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      3f253296
  11. 28 Apr, 2003 3 commits
    • unknown's avatar
      Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00: · 4ceb2578
      unknown authored
      
      Docs/internals.texi:
        Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:01:19)
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      4ceb2578
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c9a7f29b
      unknown authored
      into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor
      
      
      BitKeeper/etc/ignore:
        auto-union
      c9a7f29b
    • unknown's avatar
      SCRUM · c13f5558
      unknown authored
      Protocol_cursor task
      net_field_length definitions trimmed with Monty's suggestions
      
      
      BitKeeper/etc/ignore:
        Added sql/pack.c to the ignore list
      include/my_global.h:
        my_ulonglong definition moved here from mysql.h
      include/mysql.h:
        we define my_ulonglong here only if no global.h included
      include/mysql_com.h:
        net_field_length_ll definition is here now
      sql/mini_client.cc:
        unnecessary cast removed
      c13f5558
  12. 27 Apr, 2003 1 commit
    • unknown's avatar
      Post-fix of bug #302 fix. · 64cad16f
      unknown authored
      Fixed bug #320.
      Some new tests and cosmetic changes.
      Another strcasecmp() replaced.
      
      
      mysql-test/r/sp.result:
        Moved SP tests from subselect and added some more.
      mysql-test/r/subselect.result:
        Moved SP tests to sp.test.
      mysql-test/t/sp.test:
        Moved SP tests from subselect and added some more.
      mysql-test/t/subselect.test:
        Moved SP tests to sp.test.
      sql/sp.cc:
        Don't close derived tables.
      sql/sp_head.cc:
        Minor layout and comment fix.
      sql/sp_head.h:
        Minor comment fix.
      sql/sql_derived.cc:
        Don't set org_table_list->derived to 1 when debugging, as this breaks certain
        subselect args to SPs.
      sql/sql_parse.cc:
        Post-fix of bugfix (free memory on error), and added comment.
      sql/sql_yacc.yy:
        Another strcasecmp() replaced.
      64cad16f
  13. 26 Apr, 2003 3 commits
    • unknown's avatar
      Post-merge fix. · 55e233ad
      unknown authored
      55e233ad
    • unknown's avatar
      merge fix · 0c94064b
      unknown authored
      
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      0c94064b
    • unknown's avatar
      Making a better fix for double released pointers and safe · 18a321ad
      unknown authored
      TMP_TABLE_PARAM.
      This involved moving things around in include files.
      All tests, including the ones with Valgrind passed.
      
      
      18a321ad
  14. 25 Apr, 2003 1 commit
  15. 24 Apr, 2003 9 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · bab7aac7
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      bab7aac7
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9b7a51d8
      unknown authored
      into hundin.mysql.fi:/home/igor/dev/mysql-4.1
      
      
      mysql-test/r/ctype_collate.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      9b7a51d8
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 50c17af0
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1
      
      
      50c17af0
    • unknown's avatar
      added '.' to end of compressed string · 78f19df0
      unknown authored
      78f19df0
    • unknown's avatar
      Replication: new code to not modify in-memory log positions until the COMMIT · 9f4f19d9
      unknown authored
      is executed, even if the transaction spans on >=2 relay logs (bug #53).
      New variable relay_log_purge =0|1
      New test to verify bug #53
      
      
      sql/log.cc:
        Now we purge a relay log only when we are sure we won't need it,
        i.e. we have executed the final query (if autocommit=1) or the COMMIT.
      sql/log_event.cc:
        Better tracking of the relay log's name and position
        lastly executed, even if we are in a transaction which spans on
        2 or more relay logs.
      sql/mysql_priv.h:
        new option relay_log_purge (the user can now decide himself
        if he wants his relay logs to be automatically purged or not,
        we don't make unsafe guesses like before)
      sql/mysqld.cc:
        new option --innodb (replaces --skip-innodb).
        Useful for the test suite : we have skip-innodb in mysql-test-run,
        but we can ('-opt.info' file) choose to start the server with
        InnoDB for this test only.
        New option --bdb
      sql/repl_failsafe.cc:
        Better tracking of the relay log's name and position
        lastly executed, even if we are in a transaction which spans on
        2 or more relay logs.
      sql/set_var.cc:
        new variable relay_log_purge
      sql/slave.cc:
        Better tracking of the relay log's name and position
        lastly executed, even if we are in a transaction which spans on
        2 or more relay logs.
        Now we purge a relay log only when we are sure we won't need it,
        i.e. we have executed the final query (if autocommit=1) or the COMMIT
      sql/slave.h:
        Better tracking of the relay log's name and position
        lastly executed, even if we are in a transaction which spans on
        2 or more relay logs.
      sql/sql_class.h:
        prototypes change
      sql/sql_parse.cc:
        removed thd argument (was not used in the function's body)
      sql/sql_repl.cc:
        Better tracking of the relay log's name and position
        lastly executed, even if we are in a transaction which spans on
        2 or more relay logs.
        Turn relay_log_purge silently off when someone does CHANGE
        MASTER TO RELAY_LOG_*
      9f4f19d9
    • unknown's avatar
      func_gconcat.result, ctype_many.result: · 4b19dfd4
      unknown authored
         Added the MAX_LENGTH_FOR_SORT_DATA option
      ctype_collate.result:
        Added the MAX_LENGTH_FOR_SORT_DATA option
      
      
      mysql-test/r/ctype_collate.result:
        Added the MAX_LENGTH_FOR_SORT_DATA option
      mysql-test/r/ctype_many.result:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      mysql-test/r/func_gconcat.result:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      4b19dfd4
    • unknown's avatar
      Many files: · a7f8b1cb
      unknown authored
         Added the MAX_LENGTH_FOR_SORT_DATA option
      filesort.cc:
        Added the MAX_LENGTH_FOR_SORT_DATA option
      
      
      sql/filesort.cc:
        Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/mysqld.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/opt_range.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/records.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/set_var.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/sql_base.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/sql_class.h:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/sql_delete.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/sql_select.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/sql_sort.h:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/sql_table.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/sql_update.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/structs.h:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/table.h:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      sql/uniques.cc:
         Added the MAX_LENGTH_FOR_SORT_DATA option
      a7f8b1cb
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 06e8139b
      unknown authored
      into deer.mysql.r18.ru:/home/hf/work/mysql-5.0.kil
      
      
      06e8139b
    • unknown's avatar
      SCRUM · d19e16d4
      unknown authored
      two versions of KILL
      small fix
      
      
      sql/sql_select.cc:
        it's more logical to use killed here
      d19e16d4
  16. 23 Apr, 2003 9 commits
    • unknown's avatar
      subselect in procedure argument list (Bug #302) · 37c94017
      unknown authored
      
      BitKeeper/etc/ignore:
        Added libmysqld/sp_pcontext.cc libmysqld/sp.cc libmysqld/sp_head.cc to the ignore list
      mysql-test/r/subselect.result:
        test of subselect in procedure argument list
      mysql-test/t/subselect.test:
        test of subselect in procedure argument list
      sql/sp_head.cc:
        subselect in procedure argument list
      sql/sql_parse.cc:
        subselect in procedure argument list
      37c94017
    • unknown's avatar
      SCRUM · f0909cd7
      unknown authored
      Protocol_cursor class and sql-common/ directory
      
      
      Makefile.am:
        pack.c added to linked sources
      include/mysql.h:
        net_field_length_ll declaration added
      include/mysql_com.h:
        net_field_length declaration added
      libmysql/Makefile.am:
        sql-common files symlinked
      libmysql/Makefile.shared:
        pack.lo target added
      libmysql/libmysql.c:
        net_field_length removed from here
      sql/Makefile.am:
        pack.c added to the sources
      sql/mini_client.cc:
        mc_net_field_length functions replaced with net_field_length
      sql/protocol.h:
        Protocol_cursor class added
      f0909cd7
    • unknown's avatar
      Fixes bug #302: call u((select 1)) now works. · 44052160
      unknown authored
      More complex cases, like call u((select x from table limit 1)) does not.
      
      
      44052160
    • unknown's avatar
      set_var.cc: · 4ac98ec5
      unknown authored
        We don't need this code any more. It was used to initialize CONVERT structure in 4.0.
      
      
      sql/set_var.cc:
        We don't need this code any more. It was used to initialize CONVERT structure in 4.0.
      4ac98ec5
    • unknown's avatar
      Variable names have been renamed: · bb12690a
      unknown authored
        client_collation -> collation_client
        result_collation -> collation_results
        connection_collation -> collation_connection
      
      
      BitKeeper/etc/ignore:
        Added client/ssl_test to the ignore list
      bb12690a
    • unknown's avatar
      Fix bug#68: ssl_test.c does not compile/work · fbf47d52
      unknown authored
      fbf47d52
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 711eb800
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1
      
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      711eb800
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · b6480688
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      b6480688
    • unknown's avatar
      Made multiple queries (SELECT without INTO) work in SPs. · f525047d
      unknown authored
      This included bug fixes in the 4.1 protocol (actually send and receive the
      server_status flags).
      
      
      libmysql/libmysql.c:
        Pick up the server_status (with the 4.1 protocol) as well.
      mysql-test/r/sp-error.result:
        Test for "bad selects" in non-CLIENT_MULTI_QUERIES clients (as mysqltest for the
        momen; this test will have to go away eventually).
      mysql-test/t/sp-error.test:
        Test for "bad selects" in non-CLIENT_MULTI_QUERIES clients (as mysqltest for the
        momen; this test will have to go away eventually).
      sql/protocol.cc:
        Actually send the server_status flags in send_eof() (4.1 protocol), not just zero.
      sql/sp_head.cc:
        Made multiple queries (SELECT without INTO) work in SPs.
      sql/sp_head.h:
        Made multiple queries (SELECT without INTO) work in SPs.
      sql/sql_parse.cc:
        Made multiple queries (SELECT without INTO) work in SPs.
      sql/sql_yacc.yy:
        Made multiple queries (SELECT without INTO) work in SPs.
      f525047d