1. 04 Jan, 2003 1 commit
    • unknown's avatar
      Added support for DROP TEMPORARY TABLE · 30c11344
      unknown authored
      Removed mysql_warnings() API function.
      Post merge fixes.
      
      
      client/mysqltest.c:
        Don't use mysql_warnings().
      include/mysql.h:
        Removed mysql_warnings() API function
      libmysql/libmysql.c:
        Removed mysql_warnings() API function
      mysql-test/r/rpl_log_pos.result:
        Updated results
      mysql-test/t/connect.test:
        Removed empty lines
      mysql-test/t/rpl_log_pos.test:
        Update to new syntax
      sql/item.h:
        Fix after merge
      sql/item_create.cc:
        Fix after merge
      sql/mysql_priv.h:
        Added support for DROP TEMPORARY TABLE
      sql/sql_db.cc:
        Added support for DROP TEMPORARY TABLE
      sql/sql_parse.cc:
        SHOW WARNINGS now shows notes, warnings and errors.
        Support for DROP TEMPORARY TABLE
        Post merge fixes
      sql/sql_repl.cc:
        Post merge fixes
      sql/sql_table.cc:
        Added support for DROP TEMPORARY TABLE
      30c11344
  2. 02 Jan, 2003 6 commits
    • unknown's avatar
      Merge with 4.0.8 · 59135206
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      VC++Files/sql/mysqld.dsp:
        Auto merged
      acinclude.m4:
        Auto merged
      include/my_base.h:
        Auto merged
      include/myisam.h:
        Auto merged
      include/myisammrg.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/mi_write.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/case.result:
        Auto merged
      mysql-test/r/distinct.result:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/key_diff.result:
        Auto merged
      mysql-test/r/multi_update.result:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/t/multi_update.test:
        Auto merged
      mysql-test/t/rpl_log_pos.test:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_myisammrg.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql-bench/crash-me.sh:
        Auto merged
      sql-bench/server-cfg.sh:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/structs.h:
        Auto merged
      59135206
    • unknown's avatar
      Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · 5fcd61be
      unknown authored
      
      sql/net_serv.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      5fcd61be
    • unknown's avatar
      Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · e4b0ba04
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.0
      
      e4b0ba04
    • unknown's avatar
      Fixing some bugs in client - server protocol and adding a feature · d142ad18
      unknown authored
      that connection does not close in the case when client sends a 
      buffer larger then max_allowed_packet.
      
      d142ad18
    • unknown's avatar
      Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · 58d02995
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      58d02995
    • unknown's avatar
      Small optimization of sending big blocks. · 25e6c068
      unknown authored
      Updated Italian error messages
      
      
      sql/net_serv.cc:
        Small optimization of sending big blocks.
        Some small formating changes
      sql/share/italian/errmsg.txt:
        Updated error messages (by Cristian Giussani)
      25e6c068
  3. 31 Dec, 2002 1 commit
    • unknown's avatar
      ha_innodb.cc: · f0d4cad9
      unknown authored
        Fix bug: could not switch trx isolation back to REPEATABLE READ after switching it to some other level
      
      
      sql/ha_innodb.cc:
        Fix bug: could not switch trx isolation back to REPEATABLE READ after switching it to some other level
      f0d4cad9
  4. 27 Dec, 2002 2 commits
  5. 26 Dec, 2002 6 commits
    • unknown's avatar
      Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns · bfd3f4ef
      unknown authored
      Changed long packat handling to check for packets of length 0xffffff.
      This does however break packet handling for older clients.
      If you are using packets >= 16M then you need to upgrade client and server
      after this patch.
      
      
      Docs/internals.texi:
        Updated documentation for 4.1 protocol
      sql/ha_innodb.cc:
        Optimization of checking command
      sql/item.h:
        Removed automatic set of length for Item_string
      sql/item_create.cc:
        Optimized create of create_func_current_user()
      sql/net_serv.cc:
        Fixed wrong max packet length
      sql/sql_acl.cc:
        Safety fix.
      sql/sql_parse.cc:
        Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
      bfd3f4ef
    • unknown's avatar
      added FROM DUAL for derived tables · 6827968b
      unknown authored
      6827968b
    • unknown's avatar
      Test cleanup · 9a54cc30
      unknown authored
      
      mysql-test/r/case.result:
        Removed unnecessary drop commands
      mysql-test/t/case.test:
        Removed unnecessary drop commands
      9a54cc30
    • unknown's avatar
      merge · 4d81fae0
      unknown authored
      4d81fae0
    • unknown's avatar
      Update of test results · 6b1e36bd
      unknown authored
      6b1e36bd
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · ca89968f
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-send_error-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      ca89968f
  6. 25 Dec, 2002 4 commits
  7. 24 Dec, 2002 7 commits
    • unknown's avatar
      Fix messages in other languages · fa725c5a
      unknown authored
      
      sql/share/czech/errmsg.txt:
        Chezh
      sql/share/danish/errmsg.txt:
        Danish
      sql/share/dutch/errmsg.txt:
        Dutch
      sql/share/estonian/errmsg.txt:
        Estonian
      sql/share/french/errmsg.txt:
        French
      sql/share/german/errmsg.txt:
        German
      sql/share/greek/errmsg.txt:
        Greek
      sql/share/hungarian/errmsg.txt:
        Hungarian
      sql/share/italian/errmsg.txt:
        Italian
      sql/share/japanese/errmsg.txt:
        Japanese
      sql/share/korean/errmsg.txt:
        Korean
      sql/share/norwegian-ny/errmsg.txt:
        Norwegian-ny
      sql/share/norwegian/errmsg.txt:
        Norwegian
      sql/share/polish/errmsg.txt:
        polish
      sql/share/portuguese/errmsg.txt:
        Portuguese
      sql/share/romanian/errmsg.txt:
        Romainian
      sql/share/russian/errmsg.txt:
        Russian
      sql/share/serbian/errmsg.txt:
        Serbian
      sql/share/slovak/errmsg.txt:
        Slovak
      sql/share/spanish/errmsg.txt:
        spanish
      sql/share/swedish/errmsg.txt:
        Swedish
      sql/share/ukrainian/errmsg.txt:
        Ukrainian
      fa725c5a
    • unknown's avatar
      Correct wrong error messages · c52b18ed
      unknown authored
      
      sql/share/english/errmsg.txt:
        Correct Error messages to match actual behavior
      c52b18ed
    • unknown's avatar
      - bumped up version number to 4.0.8-gamma · fbd35e8d
      unknown authored
       - tagged ChangeSet 1.1484 as mysql-4.0.7
      
      
      configure.in:
         - bumped up version number to 4.0.8-gamma
      fbd35e8d
    • unknown's avatar
      Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 87f74f53
      unknown authored
      into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
      
      87f74f53
    • unknown's avatar
      fix for an error in the merge from 3.23 · 5c8bbf9d
      unknown authored
      5c8bbf9d
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 7f71b2ce
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-derived-4.1
      
      
      sql/item.cc:
        Auto merged
      7f71b2ce
    • unknown's avatar
      thd_charset copy in lex · 5c775f97
      unknown authored
      5c775f97
  8. 23 Dec, 2002 5 commits
  9. 21 Dec, 2002 4 commits
    • unknown's avatar
      Many files: · c20b11f9
      unknown authored
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      sql_select.cc:
        Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout
      
      
      sql/sql_select.cc:
        Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout
      innobase/btr/btr0sea.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/dict/dict0dict.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/fsp/fsp0fsp.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/ibuf/ibuf0ibuf.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/include/buf0buf.h:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/include/db0err.h:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/include/dict0mem.h:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/include/mem0mem.h:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/include/row0mysql.h:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/include/row0upd.h:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/include/mem0mem.ic:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/mem/mem0pool.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/row/row0ins.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/row/row0mysql.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/row/row0sel.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/row/row0upd.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/srv/srv0start.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      innobase/ut/ut0ut.c:
        Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
      c20b11f9
    • unknown's avatar
      Merge with 3.23: · 0b7e6073
      unknown authored
      Remove duplicate casedn_str() in mysql_change_db()
      Fix for null handling in CASE
      
      
      innobase/btr/btr0sea.c:
        Auto merged
      mysql-test/t/case.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/case.result:
        merge with 3.23
      sql/sql_db.cc:
        Merge with 3.23 (to remove duplicate casedn_str())
      0b7e6073
    • unknown's avatar
      Optimization of CASE bug fix · 4f83e3fa
      unknown authored
      4f83e3fa
    • unknown's avatar
      errmsg.txt: · 40f9e84b
      unknown authored
        More descriptive foreign key error messages
      
      
      sql/share/english/errmsg.txt:
        More descriptive foreign key error messages
      40f9e84b
  10. 20 Dec, 2002 4 commits