1. 29 Jul, 2005 11 commits
  2. 28 Jul, 2005 9 commits
    • unknown's avatar
      After merge fixes · f11418f7
      unknown authored
      
      mysql-test/r/func_group.result:
        Update results after merge (things moved around when aligning 4.1 and 5.0 tests)
      mysql-test/r/mysqldump.result:
        Update results after merge (things moved around when aligning 4.1 and 5.0 tests)
      mysql-test/r/ps_grant.result:
        Update results after merge (test moved to another file)
      mysql-test/t/mysqldump.test:
        Align with other lines
      sql/lock.cc:
        Removed compiler warning
        Fixed typo during merge
      f11418f7
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-10351 · 98c57c1a
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/item.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      98c57c1a
    • unknown's avatar
      Manual merge of 5.0.10a back to the general tree. · a487f2f0
      unknown authored
      
      configure.in:
        Manual merge of 5.0.10a back to the general tree, general version remains 5.0.11.
      a487f2f0
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.1 · 36b6bf2e
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-ctype_cp932.test:
        Auto merged
      BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
        Auto merged
      include/thr_lock.h:
        Auto merged
      mysql-test/t/alias.test:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/archive.test:
        Auto merged
      mysql-test/t/backup.test:
        Auto merged
      mysql-test/t/bool.test:
        Auto merged
      mysql-test/t/connect.test:
        Auto merged
      mysql-test/t/count_distinct2.test:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/ctype_many.test:
        Auto merged
      mysql-test/t/ctype_ucs_binlog.test:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/delayed.test:
        Auto merged
      mysql-test/t/derived.test:
        Auto merged
      mysql-test/t/distinct.test:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/endspace.test:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/fulltext_order_by.test:
        Auto merged
      mysql-test/t/func_compress.test:
        Auto merged
      mysql-test/t/func_concat.test:
        Auto merged
      mysql-test/t/func_date_add.test:
        Auto merged
      mysql-test/t/func_equal.test:
        Auto merged
      mysql-test/t/func_if.test:
        Auto merged
      mysql-test/t/func_sapdb.test:
        Auto merged
      mysql-test/t/func_set.test:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      mysql-test/t/gis-rtree.test:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      mysql-test/t/grant_cache.test:
        Auto merged
      mysql-test/t/heap.test:
        Auto merged
      mysql-test/t/heap_btree.test:
        Auto merged
      mysql-test/t/heap_hash.test:
        Auto merged
      mysql-test/t/init_connect.test:
        Auto merged
      mysql-test/t/insert_select.test:
        Auto merged
      mysql-test/t/insert_update.test:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      mysql-test/t/keywords.test:
        Auto merged
      mysql-test/t/limit.test:
        Auto merged
      mysql-test/t/lock.test:
        Auto merged
      mysql-test/t/lowercase_table.test:
        Auto merged
      mysql-test/t/lowercase_table3.test:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/mysqlbinlog2.test:
        Auto merged
      mysql-test/t/ndb_alter_table.test:
        Auto merged
      mysql-test/t/ndb_autodiscover.test:
        Auto merged
      mysql-test/t/ndb_charset.test:
        Auto merged
      mysql-test/t/ndb_grant.later:
        Auto merged
      mysql-test/t/ndb_index_ordered.test:
        Auto merged
      mysql-test/t/ndb_index_unique.test:
        Auto merged
      mysql-test/t/ndb_restore.test:
        Auto merged
      mysql-test/t/ndb_types.test:
        Auto merged
      mysql-test/t/ndb_update.test:
        Auto merged
      mysql-test/t/null.test:
        Auto merged
      mysql-test/t/null_key.test:
        Auto merged
      mysql-test/t/olap.test:
        Auto merged
      mysql-test/t/openssl_1.test:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      mysql-test/t/ps_4heap.test:
        Auto merged
      mysql-test/t/ps_5merge.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/replace.test:
        Auto merged
      mysql-test/t/row.test:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl000015.test:
        Auto merged
      mysql-test/t/rpl000017.test:
        Auto merged
      mysql-test/t/rpl000018.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_charset.test:
        Auto merged
      mysql-test/t/rpl_create_database.test:
        Auto merged
      mysql-test/t/rpl_ddl.test:
        Auto merged
      mysql-test/t/rpl_deadlock.test:
        Auto merged
      mysql-test/t/rpl_empty_master_crash.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_flush_tables.test:
        Auto merged
      mysql-test/t/rpl_get_lock.test:
        Auto merged
      mysql-test/t/rpl_heap.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_m.test:
        Auto merged
      mysql-test/t/rpl_log.test:
        Auto merged
      mysql-test/t/rpl_log_pos.test:
        Auto merged
      mysql-test/t/rpl_max_relay_size.test:
        Auto merged
      mysql-test/t/rpl_multi_query.test:
        Auto merged
      mysql-test/t/rpl_openssl.test:
        Auto merged
      mysql-test/t/rpl_redirect.test:
        Auto merged
      mysql-test/t/rpl_relayrotate.test:
        Auto merged
      mysql-test/t/rpl_replicate_do.test:
        Auto merged
      mysql-test/t/rpl_reset_slave.test:
        Auto merged
      mysql-test/t/rpl_server_id2.test:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      mysql-test/t/rpl_timezone.test:
        Auto merged
      mysql-test/t/rpl_user_variables.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysql-test/t/synchronization.test:
        Auto merged
      mysql-test/t/system_mysql_db.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix.test:
        Auto merged
      mysql-test/t/temp_table.test:
        Auto merged
      mysql-test/t/timezone2.test:
        Auto merged
      mysql-test/t/timezone_grant.test:
        Auto merged
      mysql-test/t/type_float.test:
        Auto merged
      mysql-test/t/type_ranges.test:
        Auto merged
      mysql-test/t/type_timestamp.test:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      mysql-test/t/user_var-binlog.test:
        Auto merged
      mysql-test/t/warnings.test:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
        Simple merge
      mysql-test/r/ps_grant.result:
        Simple merge
      mysql-test/t/analyse.test:
        Simple merge
      mysql-test/t/auto_increment.test:
        Simple merge
      mysql-test/t/bdb.test:
        Simple merge
      mysql-test/t/bigint.test:
        Simple merge
      mysql-test/t/case.test:
        Simple merge
      mysql-test/t/cast.test:
        Simple merge
      mysql-test/t/check.test:
        Simple merge
      mysql-test/t/count_distinct.test:
        Simple merge
      mysql-test/t/ctype_latin1_de.test:
        Simple merge
      mysql-test/t/ctype_uca.test:
        Simple merge
      mysql-test/t/ctype_ucs.test:
        Simple merge
      mysql-test/t/ctype_utf8.test:
        Simple merge
      mysql-test/t/delete.test:
        Simple merge
      mysql-test/t/flush_block_commit.test:
        Simple merge
      mysql-test/t/func_default.test:
        Simple merge
      mysql-test/t/func_gconcat.test:
        Simple merge
      mysql-test/t/func_group.test:
        Aligned code with 4.1
      mysql-test/t/func_in.test:
        Simple merge
      mysql-test/t/func_math.test:
        Simple merge
      mysql-test/t/func_misc.test:
        Simple merge
      mysql-test/t/func_test.test:
        Simple merge
      mysql-test/t/func_time.test:
        Simple merge
      mysql-test/t/group_by.test:
        Simple merge
      mysql-test/t/having.test:
        Simple merge
      mysql-test/t/innodb.test:
        Simple merge
      mysql-test/t/insert.test:
        Simple merge
      mysql-test/t/join_outer.test:
        Simple merge
      mysql-test/t/kill.test:
        Simple merge
      mysql-test/t/loaddata.test:
        Simple merge
      mysql-test/t/lock_multi.test:
        Simple merge
      mysql-test/t/multi_update.test:
        Simple merge
      mysql-test/t/mysqlbinlog.test:
        Simple merge
      mysql-test/t/mysqldump.test:
        Aligned code with 4.1
      mysql-test/t/mysqltest.test:
        Simple merge
      mysql-test/t/ndb_basic.test:
        Simple merge
      mysql-test/t/ndb_cache.test:
        Simple merge
      mysql-test/t/ndb_subquery.test:
        Simple merge
      mysql-test/t/ps_grant.test:
        Simple merge
      mysql-test/t/range.test:
        Simple merge
      mysql-test/t/rpl_drop_temp.test:
        Simple merge
      mysql-test/t/rpl_loaddata_rule_s.test:
        Simple merge
      mysql-test/t/rpl_loaddatalocal.test:
        Simple merge
      mysql-test/t/rpl_rotate_logs.test:
        Simple merge
      mysql-test/t/rpl_until.test:
        Simple merge
      mysql-test/t/rpl_variables.test:
        Simple merge
      mysql-test/t/select.test:
        Simple merge
      mysql-test/t/sql_mode.test:
        Simple merge
      mysql-test/t/type_blob.test:
        Simple merge
      mysql-test/t/type_decimal.test:
        Simple merge
      mysql-test/t/user_var.test:
        Simple merge
      mysql-test/t/variables.test:
        Simple merge
      sql/lock.cc:
        Simple optimization
      sql/mysql_priv.h:
        Simple merge
      sql/sql_table.cc:
        Simple merge
      sql/table.cc:
        Simple merge
      sql/unireg.cc:
        Simple merge
      36b6bf2e
    • unknown's avatar
      Cleanups during review of new code · 79f75d8f
      unknown authored
      Ensure mysql_close() is called if mysql_set_character_set() fails
      
      
      libmysql/libmysql.c:
        Indentation cleanup
      mysql-test/r/select.result:
        Fix bad merge & align code with 4.1
      mysql-test/r/type_newdecimal.result:
        Added test of extreme case
      mysql-test/t/select.test:
        Fix bad merge & align code with 4.1
      mysql-test/t/type_newdecimal.test:
        Added test of extreme case
      mysys/charset.c:
        Removed not used variable
      mysys/default.c:
        Simplify code
      sql-common/client.c:
        Ensure mysql_close() is called if mysql_set_character_set() fails
      sql/log.cc:
        strmov(strmov())  -> strxmov()
      sql/sp.cc:
        Indentation fixes
      sql/sql_acl.cc:
        Indentation fixes
      sql/sql_base.cc:
        Added commments
        Moved variable to inner block
      sql/sql_show.cc:
        Simple optimization (removed loop variable)
      sql/sql_trigger.cc:
        strmov(strmov())  -> strxmov()
      strings/decimal.c:
        Indentation fixes
      79f75d8f
    • unknown's avatar
      row0sel.c: · 2562ba55
      unknown authored
        row_sel_store_mysql_rec(): Make comment about space padding
        more accurate.
      
      
      innobase/row/row0sel.c:
        row_sel_store_mysql_rec(): Make comment about space padding
        more accurate.
      2562ba55
    • unknown's avatar
      row_sel_store_mysql_rec(): Convert NULL true VARCHAR columns · a6350b1d
      unknown authored
      correctly.
      
      
      innobase/row/row0sel.c:
        Initialize NULL true VARCHAR columns with NUL bytes, as that is
        what the columns will contain in handler::write_row().  (Bug #12186)
      mysql-test/r/innodb.result:
        Update table checksums to reflect the new handling of
        true VARCHAR columns that are NULL.
      a6350b1d
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 57c537c6
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      57c537c6
    • unknown's avatar
      Added end marker for tests to make future merges easier · 167fb5f1
      unknown authored
      
      mysql-test/t/alias.test:
        Added end marker for test to make future merges easier
      mysql-test/t/alter_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/analyse.test:
        Added end marker for test to make future merges easier
      mysql-test/t/analyze.test:
        Added end marker for test to make future merges easier
        Fixed length of comment lines
      mysql-test/t/ansi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/archive.test:
        Added end marker for test to make future merges easier
      mysql-test/t/auto_increment.test:
        Added end marker for test to make future merges easier
      mysql-test/t/backup.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-alter-table-1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-alter-table-2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-deadlock.tminus:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bench_count_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bigint.test:
        Added end marker for test to make future merges easier
      mysql-test/t/binary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/blackhole.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bool.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bulk_replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/case.test:
        Added end marker for test to make future merges easier
      mysql-test/t/cast.test:
        Added end marker for test to make future merges easier
      mysql-test/t/check.test:
        Added end marker for test to make future merges easier
      mysql-test/t/comments.test:
        Added end marker for test to make future merges easier
      mysql-test/t/compare.test:
        Added end marker for test to make future merges easier
      mysql-test/t/connect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/consistent_snapshot.test:
        Added end marker for test to make future merges easier
      mysql-test/t/constraints.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/create.test:
        Added end marker for test to make future merges easier
      mysql-test/t/create_select_tmp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/csv.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_big5.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_collate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp1250_ch.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp1251.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp932.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_create.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_gbk.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin1_de.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_many.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_mb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_recoding.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_sjis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_tis620.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_uca.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ucs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ucs_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ujis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_utf8.test:
        Added end marker for test to make future merges easier
      mysql-test/t/date_formats.test:
        Added end marker for test to make future merges easier
      mysql-test/t/delayed.test:
        Added end marker for test to make future merges easier
      mysql-test/t/delete.test:
        Added end marker for test to make future merges easier
      mysql-test/t/derived.test:
        Added end marker for test to make future merges easier
      mysql-test/t/dirty_close.test:
        Added end marker for test to make future merges easier
      mysql-test/t/distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/drop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/drop_temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/empty_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/endspace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/errors.test:
        Added end marker for test to make future merges easier
      mysql-test/t/exampledb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/explain.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush_block_commit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/foreign_key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_left_join.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_order_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_var.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_compress.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_concat.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_crypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_date_add.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_default.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_des_encrypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_encrypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_encrypt_nossl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_equal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_gconcat.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_group.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_if.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_in.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_isnull.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_like.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_math.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_misc.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_op.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_regexp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_sapdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_set.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_str.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_system.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_test.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_time.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_timestamp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gcc296.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gis-rtree.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/group_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/handler.test:
        Added end marker for test to make future merges easier
      mysql-test/t/having.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_auto_increment.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_btree.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_hash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/help.test:
        Added end marker for test to make future merges easier
      mysql-test/t/init_connect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/init_file.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb_handler.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_select-binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_select.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/isam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join_crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join_outer.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_diff.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_primary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/keywords.test:
        Added end marker for test to make future merges easier
      mysql-test/t/kill.test:
        Added end marker for test to make future merges easier
      mysql-test/t/limit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/loaddata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock_tables_lost_commit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table_qcache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/metadata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/multi_statement.test:
        Added end marker for test to make future merges easier
      mysql-test/t/multi_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/myisam-blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/myisam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysql_client_test.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysql_protocols.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqlbinlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqlbinlog2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqldump.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqltest.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_alter_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_autodiscover.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_autodiscover2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_basic.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_config.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_database.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_grant.later:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index_ordered.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index_unique.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_insert.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_limit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_minmax.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_restore.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_subquery.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_transaction.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_truncate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_types.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/negation_elimination.test:
        Added end marker for test to make future merges easier
      mysql-test/t/not_embedded_server.test:
        Added end marker for test to make future merges easier
      mysql-test/t/null.test:
        Added end marker for test to make future merges easier
      mysql-test/t/null_key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/odbc.test:
        Added end marker for test to make future merges easier
      mysql-test/t/olap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/openssl_1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/order_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/order_fill_sortbuf.test:
        Added end marker for test to make future merges easier
      mysql-test/t/outfile.test:
        Added end marker for test to make future merges easier
      mysql-test/t/overflow.test:
        Added end marker for test to make future merges easier
      mysql-test/t/packet.test:
        Added end marker for test to make future merges easier
      mysql-test/t/preload.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_10nestset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_11bugs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_1general.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_2myisam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_3innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_4heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_5merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_6bdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_7ndb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/query_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/query_cache_merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/raid.test:
        Added end marker for test to make future merges easier
      mysql-test/t/range.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rename.test:
        Added end marker for test to make future merges easier
      mysql-test/t/repair.test:
        Added end marker for test to make future merges easier
      mysql-test/t/replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rollback.test:
        Added end marker for test to make future merges easier
      mysql-test/t/row.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000001.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000002.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000004.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000005.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000006.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000008.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000009.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000010.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000011.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000012.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000013.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000015.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000017.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000018.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_EE_error.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_alter.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_chain_temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_change_master.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_commit_after_flush.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_create_database.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ddl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_delete_all.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_do_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_drop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_drop_temp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_empty_master_crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_error_ignored_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_failed_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_failsafe.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_flush_log_loop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_flush_tables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_free_items.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_get_lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ignore_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_init_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_insert_id.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_insert_ignore.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata_rule_m.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata_rule_s.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddatalocal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_log.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_log_pos.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_many_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_master_pos_wait.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_max_relay_size.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_misc_functions.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_delete.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_delete2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_query.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_mystery22.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_openssl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ps.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_redirect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_relayrotate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_relayspace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_replicate_do.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_reset_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_rewrite_db.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_rotate_logs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_server_id1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_server_id2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_set_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_skip_error.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_sporadic_master.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_start_stop_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_temporary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_timezone.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_trunc_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_until.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_user_variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select_found.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select_safe.test:
        Added end marker for test to make future merges easier
      mysql-test/t/show_check.test:
        Added end marker for test to make future merges easier
      mysql-test/t/skip_name_resolve.test:
        Added end marker for test to make future merges easier
      mysql-test/t/sql_mode.test:
        Added end marker for test to make future merges easier
      mysql-test/t/status.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect_gis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect_innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/symlink.test:
        Added end marker for test to make future merges easier
      mysql-test/t/synchronization.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db_fix.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db_refs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/tablelock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/truncate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_date.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_datetime.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_decimal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_enum.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_float.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_nchar.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_ranges.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_set.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_time.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_timestamp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_uint.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_year.test:
        Added end marker for test to make future merges easier
      mysql-test/t/union.test:
        Added end marker for test to make future merges easier
      mysql-test/t/update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/user_var-binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/user_var.test:
        Added end marker for test to make future merges easier
      mysql-test/t/varbinary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/warnings.test:
        Added end marker for test to make future merges easier
      167fb5f1
  3. 27 Jul, 2005 20 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 520ebda4
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      520ebda4
    • unknown's avatar
      Missing initialisation of table->s->db in lock_table_name · 9bbcede4
      unknown authored
      Bug #12112
      
      
      9bbcede4
    • unknown's avatar
      We have also to test 'conds' even if there was no tables. · e0b13405
      unknown authored
      (This is because conds may not be a constant)
      This bug caused a failure in the test suite for select.test becasue for prepared statements in one case a 'constant sub query' was not regarded as a constant
      Sanja will as a separate task check if we can fix that the sub query can be recognized as a constant
      Bug #12217
      
      
      sql/sql_select.cc:
        We have also to test 'conds' even if there was no tables.
        (This is because conds may not be a constant)
        This bug caused a failure in the test suite for select.test becasue for prepared statements in one case a 'constant sub query' was not regarded as a constant
        Sanja will as a separate task check if we can fix that the sub query can be recognized as a constant
      e0b13405
    • unknown's avatar
      - build the RPM binaries against the bundled zlib, when static linking is requested · 7b88672d
      unknown authored
      
      support-files/mysql.spec.sh:
        - build against the bundled zlib, when linking statically
      7b88672d
    • unknown's avatar
      - applied a security fix to inftrees.h from the bundled zlib to resolve a second · 62f8a31b
      unknown authored
        potential zlib security vulnerability (CAN-2005-1849). Fix was taken from the
        official zlib-1.2.3 distribution (no other zlib-1.2.3 changes were applied)
      
      
      zlib/inftrees.h:
        - applied another security fix to resolve CAN-2005-1849, taken from the 1.2.3 zlib
          sources
      62f8a31b
    • unknown's avatar
      Fix for bug#12127 triggers do not show in info_schema before they are used if... · 983a836f
      unknown authored
      Fix for bug#12127 triggers do not show in info_schema before they are used if set to the database(2nd version)
        use db name of table which trigger belongs to
        instead of thd->db name during trigger body parsing
      
      
      
      983a836f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 29196873
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/unireg.cc:
        Auto merged
      29196873
    • unknown's avatar
      Fixed comment · 7ee715d7
      unknown authored
      7ee715d7
    • unknown's avatar
      Fix shortcircuit of 127.0.0.1 -> localhost lookup on little-endian machines. (Bug #11822) · 26ae9152
      unknown authored
      (Originally:   1.1891 05/07/25 12:07:47 jimw@mysql.com )
      
      
      configure.in:
        Modify version number.
      sql/hostname.cc:
        Fix comparison against INADDR_LOOPBACK to deal with endianness.
        (Originally applied to "sql/hostname.cpp":   1.31 05/07/25 12:07:44 jimw@mysql.com )
      26ae9152
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · b340b7b7
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      b340b7b7
    • unknown's avatar
      after-merge fix · 85224701
      unknown authored
      85224701
    • unknown's avatar
      fix for bug#9968 (slow query log contains useless entries) · b8d992f0
      unknown authored
      Query has to be written to the log before calling
      thd->set_statement(&stmt_backup), otherwise query will be empty.
      Setting thd->enabe_slow_log to FALSE prevents that dispatch_command
      logs the (empty) query again.
      
      
      b8d992f0
    • unknown's avatar
      Moved test for 'show full processlist' to not_embedded_server.test becasue it... · 53f40f95
      unknown authored
      Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected
      
      
      mysql-test/r/ps_grant.result:
        Deallocate prepare statements
        Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected
      mysql-test/t/ps_grant.test:
        Deallocate prepare statements
        Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected
      sql/sql_lex.cc:
        Fixed typo
      mysql-test/r/not_embedded_server.result:
        New BitKeeper file ``mysql-test/r/not_embedded_server.result''
      mysql-test/t/not_embedded_server.test:
        New BitKeeper file ``mysql-test/t/not_embedded_server.test''
      BitKeeper/etc/ignore:
        added ndb/tools/ndb_config
      53f40f95
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 · d70aead7
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/thr_lock.h:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_base.cc:
        Simple merge
      d70aead7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8bb396dc
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      8bb396dc
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 71e8b591
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      sql/field.cc:
        Auto merged
      mysql-test/r/strict.result:
        merging
      mysql-test/t/strict.test:
        merging
      71e8b591
    • unknown's avatar
      Review of new code: · 34b340c4
      unknown authored
      Change argument order to be database, tablename for some functions
      
      
      sql/lock.cc:
        Remove not needed block
      sql/mysql_priv.h:
        Change argument order to be database, tablename (like in most other functions)
      sql/sql_table.cc:
        Change argument order to be database, tablename (like in most other functions)
        Make 'flags' inline
      sql/table.cc:
        Change argument order to be database, tablename (like in most other functions)
      sql/unireg.cc:
        Change argument order to be database, tablename (like in most other functions)
      34b340c4
    • unknown's avatar
      Merging · 62aad333
      unknown authored
      
      sql/sql_parse.cc:
        error function changed
      62aad333
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-4.1.11329 · ed7a5018
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.clean
      
      
      sql/mysqld.cc:
        Auto merged
      ed7a5018
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 · 7ad6e107
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.11329
      
      
      7ad6e107