1. 05 Jan, 2003 1 commit
    • unknown's avatar
      Changed mysql-test to print warnings for not existing table to DROP TABLE · 14810ff1
      unknown authored
      Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
      changed store_warning() -> push_warning_print()
      
      
      
      BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87:
        Delete: mysql-test/t/rpl000016-slave.opt
      BitKeeper/deleted/.del-sel000001.test~9567c1646058cc:
        Delete: mysql-test/t/sel000001.test
      BitKeeper/deleted/.del-sel000002.test~9f500639572e18e1:
        Delete: mysql-test/t/sel000002.test
      BitKeeper/deleted/.del-sel000003.test~63a5512d18cd20a2:
        Delete: mysql-test/t/sel000003.test
      BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86:
        Delete: mysql-test/r/sel000001.result
      BitKeeper/deleted/.del-sel000002.result~d1787e6fd5dbc1cc:
        Delete: mysql-test/r/sel000002.result
      BitKeeper/deleted/.del-sel000003.result~d7b657b1e3a286a7:
        Delete: mysql-test/r/sel000003.result
      BitKeeper/deleted/.del-sel000031.result~d49aeac63ad7db4d:
        Delete: mysql-test/r/sel000031.result
      BitKeeper/deleted/.del-sel000031.test~50a19a8e204e99bc:
        Delete: mysql-test/t/sel000031.test
      BitKeeper/deleted/.del-sel000032.result~6cb30e23cbca9fb0:
        Delete: mysql-test/r/sel000032.result
      BitKeeper/deleted/.del-sel000032.test~e32da7c3fc4b7ace:
        Delete: mysql-test/t/sel000032.test
      BitKeeper/deleted/.del-rpl000003.result~68d6ee00beaa011:
        Delete: mysql-test/r/rpl000003.result
      BitKeeper/deleted/.del-rpl000003.test~b7cfc4c5576fbafd:
        Delete: mysql-test/t/rpl000003.test
      client/mysql.cc:
        Don't yet print information about SQL help
      client/mysqltest.c:
        Added test options:
        --enable_warnings
        --disable_warnings
        --enable_info
        --disable_info
      configure.in:
        changed version number of shared libraries
      mysql-test/include/master-slave.inc:
        Don't write warnings on init
      mysql-test/r/backup.result:
        Updated results
      mysql-test/r/bdb.result:
        Updated results
      mysql-test/r/bigint.result:
        Updated results
      mysql-test/r/bool.result:
        Updated results
      mysql-test/r/create.result:
        Updated results
      mysql-test/r/delete.result:
        Updated results
      mysql-test/r/derived.result:
        Updated results
      mysql-test/r/distinct.result:
        Updated results
      mysql-test/r/drop.result:
        Updated results
      mysql-test/r/flush.result:
        Updated results
      mysql-test/r/fulltext.result:
        Updated results
      mysql-test/r/fulltext_multi.result:
        Updated results
      mysql-test/r/fulltext_order_by.result:
        Updated results
      mysql-test/r/func_equal.result:
        Updated results
      mysql-test/r/func_in.result:
        Updated results
      mysql-test/r/func_set.result:
        Updated results
      mysql-test/r/gcc296.result:
        Updated results
      mysql-test/r/group_by.result:
        Updated results
      mysql-test/r/innodb-deadlock.result:
        Updated results
      mysql-test/r/innodb.result:
        Updated results
      mysql-test/r/innodb_cache.result:
        Updated results
      mysql-test/r/innodb_handler.result:
        Updated results
      mysql-test/r/insert.result:
        Updated results
      mysql-test/r/insert_select.result:
        Updated results
      mysql-test/r/isam.result:
        Updated results
      mysql-test/r/join_outer.result:
        Updated results
      mysql-test/r/key.result:
        Updated results
      mysql-test/r/merge.result:
        Updated results
      mysql-test/r/multi_update.result:
        Updated results
      mysql-test/r/myisam.result:
        Updated results
      mysql-test/r/null.result:
        Updated results
      mysql-test/r/null_key.result:
        Updated results
      mysql-test/r/odbc.result:
        Updated results
      mysql-test/r/olap.result:
        Updated results
      mysql-test/r/order_by.result:
        Updated results
      mysql-test/r/query_cache.result:
        Updated results
      mysql-test/r/rename.result:
        Updated results
      mysql-test/r/row.result:
        Updated results
      mysql-test/r/rpl000001.result:
        Updated results
      mysql-test/r/rpl000002.result:
        Updated results
      mysql-test/r/rpl000004.result:
        Updated results
      mysql-test/r/rpl000005.result:
        Updated results
      mysql-test/r/rpl000006.result:
        Updated results
      mysql-test/r/rpl000008.result:
        Updated results
      mysql-test/r/rpl000009.result:
        Updated results
      mysql-test/r/rpl000010.result:
        Updated results
      mysql-test/r/rpl000011.result:
        Updated results
      mysql-test/r/rpl000012.result:
        Updated results
      mysql-test/r/rpl000013.result:
        Updated results
      mysql-test/r/rpl_alter.result:
        Updated results
      mysql-test/r/rpl_empty_master_crash.result:
        Updated results
      mysql-test/r/rpl_redirect.result:
        Updated results
      mysql-test/r/rpl_replicate_do.result:
        Updated results
      mysql-test/r/rpl_rotate_logs.result:
        Updated results
      mysql-test/r/rpl_skip_error.result:
        Updated results
      mysql-test/r/rpl_temporary.result:
        Updated results
      mysql-test/r/select.result:
        Updated results
      mysql-test/r/subselect.result:
        Updated results
      mysql-test/r/temp_table.result:
        Updated results
      mysql-test/r/type_date.result:
        Updated results
      mysql-test/r/type_float.result:
        Updated results
      mysql-test/r/union.result:
        Updated results
      mysql-test/r/update.result:
        Updated results
      mysql-test/r/user_var.result:
        Updated results
      mysql-test/r/varbinary.result:
        Updated results
      mysql-test/r/variables.result:
        Updated results
      mysql-test/r/warnings.result:
        Updated results
      mysql-test/t/alias.test:
        Don't write warnings when initializing test
      mysql-test/t/alter_table.test:
        Don't write warnings when initializing test
      mysql-test/t/analyse.test:
        Don't write warnings when initializing test
      mysql-test/t/auto_increment.test:
        Don't write warnings when initializing test
      mysql-test/t/backup.test:
        Don't write warnings when initializing test
      mysql-test/t/bdb-alter-table-1.test:
        Don't write warnings when initializing test
      mysql-test/t/bdb-crash.test:
        Don't write warnings when initializing test
      mysql-test/t/bdb-deadlock.test:
        Don't write warnings when initializing test
      mysql-test/t/bdb.test:
        Don't write warnings when initializing test
        cleaned up test
      mysql-test/t/bdb_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/bench_count_distinct.test:
        Don't write warnings when initializing test
      mysql-test/t/bigint.test:
        Don't write warnings when initializing test
      mysql-test/t/binary.test:
        Don't write warnings when initializing test
      mysql-test/t/bool.test:
        Don't write warnings when initializing test
        Changed to use standard table names
      mysql-test/t/bulk_replace.test:
        Don't write warnings when initializing test
      mysql-test/t/case.test:
        Don't write warnings when initializing test
      mysql-test/t/check.test:
        Don't write warnings when initializing test
      mysql-test/t/compare.test:
        Don't write warnings when initializing test
      mysql-test/t/connect.test:
        Removed empty line
      mysql-test/t/constraints.test:
        Don't write warnings when initializing test
      mysql-test/t/count_distinct.test:
        Don't write warnings when initializing test
      mysql-test/t/count_distinct2.test:
        Don't write warnings when initializing test
      mysql-test/t/create.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/ctype_latin1_de.test:
        Don't write warnings when initializing test
      mysql-test/t/ctype_many.test:
        Don't write warnings when initializing test
      mysql-test/t/delayed.test:
        Don't write warnings when initializing test
      mysql-test/t/delete.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/derived.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/dirty_close.test:
        Don't write warnings when initializing test
      mysql-test/t/distinct.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/drop.test:
        Don't write warnings when initializing test
      mysql-test/t/empty_table.test:
        Don't write warnings when initializing test
      mysql-test/t/err000001.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/explain.test:
        Don't write warnings when initializing test
      mysql-test/t/flush.test:
        Don't write warnings when initializing test
      mysql-test/t/foreign_key.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_distinct.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_left_join.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_multi.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_order_by.test:
        Don't write warnings when initializing test
      mysql-test/t/fulltext_update.test:
        Don't write warnings when initializing test
      mysql-test/t/func_concat.test:
        Don't write warnings when initializing test
      mysql-test/t/func_date_add.test:
        Don't write warnings when initializing test
      mysql-test/t/func_encrypt.test:
        Don't write warnings when initializing test
      mysql-test/t/func_equal.test:
        Don't write warnings when initializing test
      mysql-test/t/func_group.test:
        Don't write warnings when initializing test
      mysql-test/t/func_if.test:
        Don't write warnings when initializing test
      mysql-test/t/func_in.test:
        Don't write warnings when initializing test
      mysql-test/t/func_isnull.test:
        Don't write warnings when initializing test
      mysql-test/t/func_like.test:
        Don't write warnings when initializing test
      mysql-test/t/func_regexp.test:
        Don't write warnings when initializing test
      mysql-test/t/func_set.test:
        Don't write warnings when initializing test
        Merged test with other tests
      mysql-test/t/func_str.test:
        Don't write warnings when initializing test
      mysql-test/t/func_time.test:
        Don't write warnings when initializing test
      mysql-test/t/func_timestamp.test:
        Don't write warnings when initializing test
      mysql-test/t/gcc296.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/grant_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/group_by.test:
        Don't write warnings when initializing test
        Cleaned up test
      mysql-test/t/handler.test:
        Don't write warnings when initializing test
      mysql-test/t/having.test:
        Don't write warnings when initializing test
      mysql-test/t/heap.test:
        Don't write warnings when initializing test
      mysql-test/t/heap_auto_increment.test:
        Don't write warnings when initializing test
      mysql-test/t/heap_btree.test:
        Don't write warnings when initializing test
      mysql-test/t/heap_hash.test:
        Don't write warnings when initializing test
      mysql-test/t/innodb-deadlock.test:
        Don't write warnings when initializing test
      mysql-test/t/innodb.test:
        Don't write warnings when initializing test
      mysql-test/t/innodb_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/innodb_handler.test:
        Don't write warnings when initializing test
      mysql-test/t/ins000001.test:
        Don't write warnings when initializing test
      mysql-test/t/insert.test:
        Don't write warnings when initializing test
        cleaned up test.
        Changed to use standard database and table names
      mysql-test/t/insert_select.test:
        Don't write warnings when initializing test
        Changed to use standard table names
      mysql-test/t/insert_update.test:
        Don't write warnings when initializing test
      mysql-test/t/isam.test:
        Don't write warnings when initializing test
        cleaned up test
      mysql-test/t/join.test:
        Don't write warnings when initializing test
      mysql-test/t/join_crash.test:
        Don't write warnings when initializing test
      mysql-test/t/join_outer.test:
        Don't write warnings when initializing test
      mysql-test/t/key.test:
        Don't write warnings when initializing test
      mysql-test/t/key_diff.test:
        Don't write warnings when initializing test
      mysql-test/t/key_primary.test:
        Don't write warnings when initializing test
      mysql-test/t/keywords.test:
        Don't write warnings when initializing test
      mysql-test/t/kill.test:
        Don't write warnings when initializing test
      mysql-test/t/limit.test:
        Don't write warnings when initializing test
      mysql-test/t/lock.test:
        Don't write warnings when initializing test
      mysql-test/t/lock_multi.test:
        Don't write warnings when initializing test
      mysql-test/t/lowercase_table.test:
        Don't write warnings when initializing test
      mysql-test/t/merge.test:
        Don't write warnings when initializing test
        cleaned up test
      mysql-test/t/multi_update.test:
        Don't write warnings when initializing test
      mysql-test/t/myisam.test:
        Don't write warnings when initializing test
      mysql-test/t/null.test:
        Don't write warnings when initializing test
      mysql-test/t/null_key.test:
        Don't write warnings when initializing test
      mysql-test/t/odbc.test:
        Don't write warnings when initializing test
      mysql-test/t/olap.test:
        Don't write warnings when initializing test
      mysql-test/t/order_by.test:
        Don't write warnings when initializing test
      mysql-test/t/order_fill_sortbuf.test:
        Don't write warnings when initializing test
      mysql-test/t/query_cache.test:
        Don't write warnings when initializing test
      mysql-test/t/raid.test:
        Don't write warnings when initializing test
      mysql-test/t/range.test:
        Don't write warnings when initializing test
      mysql-test/t/rename.test:
        Don't write warnings when initializing test
      mysql-test/t/repair.test:
        Don't write warnings when initializing test
      mysql-test/t/replace.test:
        Don't write warnings when initializing test
      mysql-test/t/rollback.test:
        Don't write warnings when initializing test
      mysql-test/t/row.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000001.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000002.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000004.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000005.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000006.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000008-slave.opt:
        Don't write warnings when initializing test
      mysql-test/t/rpl000008.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000009-slave.opt:
        Don't write warnings when initializing test
      mysql-test/t/rpl000009.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000010.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000011.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000012.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000013.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000015.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000017.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl000018.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_alter.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_empty_master_crash.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_redirect.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_replicate_do.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_rotate_logs.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_skip_error.test:
        Don't write warnings when initializing test
      mysql-test/t/rpl_temporary.test:
        Don't write warnings when initializing test
      mysql-test/t/sel000033.test:
        Don't write warnings when initializing test
      mysql-test/t/sel000100.test:
        Don't write warnings when initializing test
      mysql-test/t/select.test:
        Don't write warnings when initializing test
      mysql-test/t/select_found.test:
        Don't write warnings when initializing test
      mysql-test/t/select_safe.test:
        Don't write warnings when initializing test
      mysql-test/t/show_check.test:
        Don't write warnings when initializing test
      mysql-test/t/status.test:
        Don't write warnings when initializing test
      mysql-test/t/subselect.test:
        Don't write warnings when initializing test
      mysql-test/t/symlink.test:
        Don't write warnings when initializing test
      mysql-test/t/tablelock.test:
        Don't write warnings when initializing test
      mysql-test/t/temp_table.test:
        Don't write warnings when initializing test
      mysql-test/t/truncate.test:
        Don't write warnings when initializing test
      mysql-test/t/type_blob.test:
        Don't write warnings when initializing test
      mysql-test/t/type_date.test:
        Don't write warnings when initializing test
      mysql-test/t/type_datetime.test:
        Don't write warnings when initializing test
      mysql-test/t/type_decimal.test:
        Don't write warnings when initializing test
      mysql-test/t/type_enum.test:
        Don't write warnings when initializing test
      mysql-test/t/type_float.test:
        Don't write warnings when initializing test
      mysql-test/t/type_ranges.test:
        Don't write warnings when initializing test
      mysql-test/t/type_set.test:
        Don't write warnings when initializing test
      mysql-test/t/type_time.test:
        Don't write warnings when initializing test
      mysql-test/t/type_timestamp.test:
        Don't write warnings when initializing test
      mysql-test/t/type_uint.test:
        Don't write warnings when initializing test
      mysql-test/t/type_year.test:
        Don't write warnings when initializing test
      mysql-test/t/union.test:
        Don't write warnings when initializing test
      mysql-test/t/update.test:
        Don't write warnings when initializing test
      mysql-test/t/user_var.test:
        Don't write warnings when initializing test
      mysql-test/t/varbinary.test:
        Don't write warnings when initializing test
      mysql-test/t/variables.test:
        Don't write warnings when initializing test
      mysql-test/t/warnings.test:
        Don't write warnings when initializing test
      mysys/my_vsnprintf.c:
        Safety fix
      readline/terminal.c:
        Removed compiler warnings
      sql/ha_berkeley.cc:
        Indentation changes
      sql/mysql_priv.h:
        Change store_warning -> push_warning_printf
      sql/sql_db.cc:
        Change store_warning -> push_warning_printf
      sql/sql_error.cc:
        Change store_warning -> push_warning_printf
      sql/sql_table.cc:
        Change store_warning -> push_warning_printf
      14810ff1
  2. 04 Jan, 2003 13 commits
    • unknown's avatar
      merge · 8ce6c9fc
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/multi_update.result:
        Auto merged
      mysql-test/t/multi_update.test:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      8ce6c9fc
    • unknown's avatar
      Added support for DROP TEMPORARY TABLE · e229fe98
      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
      e229fe98
    • unknown's avatar
      charset.c: · f67891c2
      unknown authored
        this function will be used to load both Index and a named charset, so let's add a new argument to pass file name
      
      
      mysys/charset.c:
        this function will be used to load both Index and a named charset, so let's add a new argument to pass file name
      f67891c2
    • unknown's avatar
      Index.xml: · f5847785
      unknown authored
        "compiled" flag
      
      
      sql/share/charsets/Index.xml:
        "compiled" flag
      f5847785
    • unknown's avatar
      .del-Index~a8f78510440e2fc4: · 5bdee64b
      unknown authored
        Delete: sql/share/charsets/Index
      
      
      BitKeeper/deleted/.del-Index~a8f78510440e2fc4:
        Delete: sql/share/charsets/Index
      5bdee64b
    • unknown's avatar
      78229513
    • unknown's avatar
      libmysql.c: · a533a95c
      unknown authored
        SLL -> SSL
      
      
      libmysql/libmysql.c:
        SLL -> SSL
      a533a95c
    • unknown's avatar
      Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · ce441534
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      
      ce441534
    • unknown's avatar
      .del-test_xml~6237d9729f4fe38: · dd644ed8
      unknown authored
        Delete: mysys/test_xml
      
      
      BitKeeper/deleted/.del-test_xml~6237d9729f4fe38:
        Delete: mysys/test_xml
      dd644ed8
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.1 · 22e4c484
      unknown authored
      into myvenu.com:/home/venu/bk/src-4.1
      
      
      sql/field.cc:
        Auto merged
      22e4c484
    • unknown's avatar
      6609f346
    • unknown's avatar
      Fix date,time,timestamp,year - binary protocol · 594bfe01
      unknown authored
      594bfe01
    • unknown's avatar
      Fix warnings and error VC++ compiler · a644e002
      unknown authored
      
      client/mysql.cc:
        Removing unreferenced variables
      sql/sql_test.cc:
        Fix VC++ compiler error that doesn't permits the declaration and
        initialization of variables that can be skipped by the prior
        goto end instruction.
      a644e002
  3. 03 Jan, 2003 13 commits
  4. 02 Jan, 2003 11 commits
    • unknown's avatar
      Merge with 4.0.8 · eebc67f6
      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
      eebc67f6
    • unknown's avatar
      Merge mysql.com:/home/pz/mysql/mysql-4.1-root · 6d4d4873
      unknown authored
      into mysql.com:/home/pz/mysql/mysql-4.1
      
      
      6d4d4873
    • unknown's avatar
      SCRUM password() function changes. · e79e53dc
      unknown authored
      
      sql/item_strfunc.cc:
        Fix password() function according Monty's comment
      e79e53dc
    • unknown's avatar
      Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · 62b38d20
      unknown authored
      
      sql/net_serv.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      62b38d20
    • unknown's avatar
      Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 8ec8636c
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.0
      
      
      8ec8636c
    • unknown's avatar
      Fixing some bugs in client - server protocol and adding a feature · 41dc1eaa
      unknown authored
      that connection does not close in the case when client sends a 
      buffer larger then max_allowed_packet.
      
      
      41dc1eaa
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/home/pz/mysql/mysql-4.1-root · c7901f2f
      unknown authored
      into mysql.com:/home/pz/mysql/mysql-4.1
      
      
      c7901f2f
    • unknown's avatar
      Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · ba8ed931
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      ba8ed931
    • unknown's avatar
      Small optimization of sending big blocks. · 0b34c533
      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)
      0b34c533
    • unknown's avatar
      post-post-review fix (SCRUM) · 3fe840ee
      unknown authored
      
      sql/item.cc:
        post-post-review fix
      sql/item_cmpfunc.h:
        post-post-review fix
      sql/item_row.cc:
        post-post-review fix
      sql/item_subselect.cc:
        post-post-review fix
      3fe840ee
  5. 01 Jan, 2003 2 commits