1. 25 Nov, 2003 24 commits
    • unknown's avatar
      sql_union.cc: · 487f0ed2
      unknown authored
        Fixed a bug: missing semicolon.
      
      
      sql/sql_union.cc:
        Fixed a bug: missing semicolon.
      487f0ed2
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · a6b0da48
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      a6b0da48
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 47d3337e
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      47d3337e
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 09fe93e9
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
      
      
      mysql-test/r/create.result:
        Auto merged
      09fe93e9
    • unknown's avatar
      added collation processing in UNION merging · 7a013ca6
      unknown authored
      temporary table BLOB now is longblob
      
      
      mysql-test/r/create.result:
        blob size changed for safety
      mysql-test/r/type_blob.result:
        blob size changed for safety
      mysql-test/r/type_ranges.result:
        blob size changed for safety
      mysql-test/r/union.result:
        blob size changed for safety
        new tests of UNION types merging
      mysql-test/t/union.test:
        new tests of UNION types merging
      sql/field.h:
        blob size changed for safety
      sql/item.cc:
        processing of collation added
        added comment
      sql/item.h:
        joining of UNION fields may failed now, because of incompatibility of collations
      sql/sql_union.cc:
        joining of UNION fields may failed now, because of incompatibility of collations
      7a013ca6
    • unknown's avatar
      fork_big2.pl: · bf99e546
      unknown authored
        Added resize key cache test.
      
      
      tests/fork_big2.pl:
        Added resize key cache test.
      bf99e546
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · c5f1796b
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-2
      
      c5f1796b
    • unknown's avatar
      fil0fil.h, fil0fil.c: · aec7248c
      unknown authored
        ibbackup --apply-log must be able to rename a table based only on the space id
      
      
      innobase/fil/fil0fil.c:
        ibbackup --apply-log must be able to rename a table based only on the space id
      innobase/include/fil0fil.h:
        ibbackup --apply-log must be able to rename a table based only on the space id
      aec7248c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6b8ceb42
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      6b8ceb42
    • unknown's avatar
      post-merge fixes · ac5f4096
      unknown authored
      
      Makefile.am:
        spurious space (from a bad merge) deleted
      mysql-test/r/rpl_change_master.result:
        test results updated
      ac5f4096
    • unknown's avatar
      Merge heikki@build.mysql.com:/home/bk/mysql-4.1 · 2a994b5f
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      2a994b5f
    • unknown's avatar
      mf_keycache.c, keycache.h: · ebebe516
      unknown authored
        Fix for the resize key cache operation.
      
      
      include/keycache.h:
        Fix for the resize key cache operation.
      mysys/mf_keycache.c:
        Fix for the resize key cache operation.
      ebebe516
    • unknown's avatar
      os0file.h, os0file.c: · f1065eda
      unknown authored
        Changes needed for ibbackup directory scanning fault tolerance
      
      
      innobase/os/os0file.c:
        Changes needed for ibbackup directory scanning fault tolerance
      innobase/include/os0file.h:
        Changes needed for ibbackup directory scanning fault tolerance
      f1065eda
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 · f41fe9d1
      unknown authored
      
      Docs/Makefile.am:
        Auto merged
      f41fe9d1
    • unknown's avatar
      - Fixed missing node name · dd64da9e
      unknown authored
      dd64da9e
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 · cf6e6c3e
      unknown authored
      
      Docs/Makefile.am:
        Auto merged
      cf6e6c3e
    • unknown's avatar
      - Removed COPYING.LIB from txt_files target in Docs/Makefile.am · 1b2179ad
      unknown authored
      
      Docs/Makefile.am:
         - Removed COPYING.LIB from txt_files target
      1b2179ad
    • unknown's avatar
      merged · 978d7ff5
      unknown authored
      
      Docs/Makefile.am:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysys/my_getopt.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      scripts/make_win_src_distribution.sh:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/r/rpl_change_master.result:
        merged - ul
      978d7ff5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 54466625
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      54466625
    • unknown's avatar
      - Removed COPYING.LIB from all source and binary distributions · 878430e8
      unknown authored
         after it was removed from manual.texi (where it was automatically
         generated from).
      
      
      Docs/Makefile.am:
         - don't create COPYING.LIB anymore (was removed from manual.texi)
      Makefile.am:
         - Removed COPYING.LIB from the source distribution
      scripts/make_binary_distribution.sh:
         - Removed COPYING.LIB from the binary distribution
      scripts/make_win_src_distribution.sh:
         - Removed COPYING.LIB from the windows source distribution
      support-files/mysql.spec.sh:
         - Removed COPYING.LIB from the Server RPM
      878430e8
    • unknown's avatar
      a script that fixes anti-GRANT'ness of privilege tables. · 33615095
      unknown authored
      It can appear as a result of manual modifications with INSERT/UPDATE/DELETE
      
      This script converts privilege table to the state that could be created
      with GRANT commands only (with the exception of the short password)
      
      This is necessary for 5.0
      
      33615095
    • unknown's avatar
      fix for bug #1946: · 5910d9f0
      unknown authored
      "You can always mysql_real_query a query with placeholders 
      after mysql_prepare()"
      
      
      sql/sql_class.cc:
        prepare_command removed
      sql/sql_class.h:
        prepare_command removed
      sql/sql_prepare.cc:
        prepare_command removed
      sql/sql_yacc.yy:
        prepare_command removed
      tests/client_test.c:
        added test for bug #1946: "You can always
        mysql_real_query a query with placeholders after mysql_prepare()"
      5910d9f0
    • unknown's avatar
      mysql-test-run fixes: · c1fdfbe7
      unknown authored
      libexec support in install_test_db
      --start-from in mysql-test-run
      
      
      mysql-test/install_test_db.sh:
        libexec support in install_test_db
      mysql-test/mysql-test-run.sh:
        --start-from in mysql-test-run
      c1fdfbe7
    • unknown's avatar
      dict0boot.c: · a09051d5
      unknown authored
        Marko's patch: check the position of some system table columns already at C compile time
      
      
      innobase/dict/dict0boot.c:
        Marko's patch: check the position of some system table columns already at C compile time
      a09051d5
  2. 24 Nov, 2003 7 commits
  3. 23 Nov, 2003 9 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 7cc69268
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
      
      7cc69268
    • unknown's avatar
      after review fixes · c73803e9
      unknown authored
      
      mysql-test/r/union.result:
        new tests, more correct results for old one
      mysql-test/t/union.test:
        new tests, more correct results for old one
      sql/field.cc:
        new way to make field types csting
      sql/field.h:
        new way to make field types csting
      sql/item.cc:
        new way to make field types csting
      sql/sql_derived.cc:
        fixed typo
      sql/sql_lex.h:
        comment added
      c73803e9
    • unknown's avatar
      Fix test for binary builds · 6da14dae
      unknown authored
      
      mysql-test/r/rpl_change_master.result:
        Updated results
      6da14dae
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · c746b929
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      c746b929
    • unknown's avatar
      Replication: · ed39d48c
      unknown authored
      Now the I/O thread (in flush_master_info()) flushes the relay log to disk
      after reading every event. Slower but provides additionnal safety in case
      of brutal crash.
      I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
      because sometimes flush_master_info() is called when there is no usable
      relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
      
      
      mysql-test/r/rpl_loaddata_rule_m.result:
        avoid a harmless error in the .err file; we don't need a slave in this test
        (even though it's called 'rpl' because it's testing binlog-ignore-db).
      mysql-test/t/rpl_loaddata_rule_m.test:
        result update
      sql/repl_failsafe.cc:
        update call to flush_master_info() according to new prototype.
      sql/slave.cc:
        - Now the I/O thread (in flush_master_info()) flushes the relay log to disk
        after reading every event. Slower but provides additionnal safety in case
        of brutal crash.
        I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
        because sometimes flush_master_info() is called when there is no usable
        relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
        - Update version in message.
        - Remove warning about bug as it's not true anymore (since this changeset).
      sql/slave.h:
        new prototype
      sql/sql_repl.cc:
        update call to flush_master_info() according to new prototype.
      ed39d48c
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ae5d1fde
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      ae5d1fde
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 061c83da
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      sql/item_func.cc:
        Auto merged
      061c83da
    • unknown's avatar
      merge with 4.0 · 982a4f0a
      unknown authored
      
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/fulltext_left_join.test:
        Auto merged
      982a4f0a
    • unknown's avatar
      Fixed compiler warnings from Intel compiler in Win64 · 73aff380
      unknown authored
      Added option --max-record-length=# to myisamchk
      Don't try repair twice if doing myisamchk --repair --force
      Shared memory handler didn't clean up things on errors or shutdown
      
      
      VC++Files/libmysqltest/mytest.c:
        Fixed compiler warnings from Intel compiler
      include/myisam.h:
        Added option --max-record-length=# to myisamchk
      include/mysql_com.h:
        Fixed compiler warnings from Intel compiler
      innobase/btr/btr0btr.c:
        Fixed compiler warnings from Intel compiler
      innobase/btr/btr0cur.c:
        Fixed compiler warnings from Intel compiler
      innobase/include/btr0btr.ic:
        Fixed compiler warnings from Intel compiler
      innobase/include/buf0buf.ic:
        Fixed compiler warnings from Intel compiler
      innobase/include/row0sel.ic:
        Fixed compiler warnings from Intel compiler
      innobase/include/row0upd.ic:
        Fixed compiler warnings from Intel compiler
      innobase/include/trx0rseg.ic:
        Fixed compiler warnings from Intel compiler
      innobase/pars/pars0opt.c:
        Fixed compiler warnings from Intel compiler
      innobase/que/que0que.c:
        Fixed compiler warnings from Intel compiler
      myisam/mi_check.c:
        Added option --max-record-length=# to myisamchk
        Better error messages
      myisam/myisamchk.c:
        Added option --max-record-length=# to myisamchk
        Don't try repair twice if doing myisamchk --repair --force
      mysql-test/r/create.result:
        Updated test results
      mysql-test/t/create.test:
        Better initialization
      sql/ha_innodb.cc:
        Fixed compiler warnings from Intel compiler
      sql/item_func.cc:
        Fixed compiler warnings from Intel compiler
      sql/mysqld.cc:
        Fixed compiler warnings from Intel compiler
        Cleaned up handle_connections_shared_memory
        Shared memory handler didn't clean up things on errors or shutdown
      strings/bmove512.c:
        Fixed compiler warnings from Intel compiler
      73aff380