1. 23 Nov, 2005 1 commit
    • unknown's avatar
      Table definition cache, part 2 · f631b361
      unknown authored
      The table opening process now works the following way:
      - Create common TABLE_SHARE object
      - Read the .frm file and unpack it into the TABLE_SHARE object
      - Create a TABLE object based on the information in the TABLE_SHARE
        object and open a handler to the table object
      
      Other noteworthy changes:
      - In TABLE_SHARE the most common strings are now LEX_STRING's
      - Better error message when table is not found
      - Variable table_cache is now renamed 'table_open_cache'
      - New variable 'table_definition_cache' that is the number of table defintions that will be cached
      - strxnmov() calls are now fixed to avoid overflows
      - strxnmov() will now always add one end \0 to result
      - engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
      - After creating a field object one must call field->init(table) before using it
      
      - For a busy system this change will give you:
       - Less memory usage for table object
       - Faster opening of tables (if it's has been in use or is in table definition cache)
       - Allow you to cache many table definitions objects
       - Faster drop of table
      
      
      mysql-test/mysql-test-run.sh:
        Fixed some problems with --gdb option
        Test both with socket and tcp/ip port that all old servers are killed
      mysql-test/r/flush_table.result:
        More tests with lock table with 2 threads + flush table
      mysql-test/r/information_schema.result:
        Removed old (now wrong) result
      mysql-test/r/innodb.result:
        Better error messages (thanks to TDC patch)
      mysql-test/r/merge.result:
        Extra flush table test
      mysql-test/r/ndb_bitfield.result:
        Better error messages (thanks to TDC patch)
      mysql-test/r/ndb_partition_error.result:
        Better error messages (thanks to TDC patch)
      mysql-test/r/query_cache.result:
        Remove tables left from old tests
      mysql-test/r/temp_table.result:
        Test truncate with temporary tables
      mysql-test/r/variables.result:
        Table_cache -> Table_open_cache
      mysql-test/t/flush_table.test:
        More tests with lock table with 2 threads + flush table
      mysql-test/t/merge.test:
        Extra flush table test
      mysql-test/t/multi_update.test:
        Added 'sleep' to make test predictable
      mysql-test/t/query_cache.test:
        Remove tables left from old tests
      mysql-test/t/temp_table.test:
        Test truncate with temporary tables
      mysql-test/t/variables.test:
        Table_cache -> Table_open_cache
      mysql-test/valgrind.supp:
        Remove warning that may happens becasue threads dies in different order
      mysys/hash.c:
        Fixed wrong DBUG_PRINT
      mysys/mf_dirname.c:
        More DBUG
      mysys/mf_pack.c:
        Better comment
      mysys/mf_tempdir.c:
        More DBUG
        Ensure that we call cleanup_dirname() on all temporary directory paths.
        
        If we don't do this, we will get a failure when comparing temporary table
        names as in some cases the temporary table name is run through convert_dirname())
      mysys/my_alloc.c:
        Indentation fix
      sql/examples/ha_example.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/examples/ha_example.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/examples/ha_tina.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/examples/ha_tina.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/field.cc:
        Update for table definition cache:
        - Field creation now takes TABLE_SHARE instead of TABLE as argument
          (This is becasue field definitions are now cached in TABLE_SHARE)
          When a field is created, one now must call field->init(TABLE) before using it
        - Use s->db instead of s->table_cache_key
        - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
        - make_field() takes TABLE_SHARE as argument instead of TABLE
        - move_field() -> move_field_offset()
      sql/field.h:
        Update for table definition cache:
        - Field creation now takes TABLE_SHARE instead of TABLE as argument
          (This is becasue field definitions are now cached in TABLE_SHARE)
          When a field is created, one now must call field->init(TABLE) before using it
        - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
        - make_field() takes TABLE_SHARE as argument instead of TABLE
        - move_field() -> move_field_offset()
      sql/ha_archive.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_archive.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_berkeley.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Changed name of argument create() to not hide internal 'table' variable.
        table->s  -> table_share
      sql/ha_berkeley.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_blackhole.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_blackhole.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_federated.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Fixed comments
        Remove index variable and replace with pointers (simple optimization)
        move_field() -> move_field_offset()
        Removed some strlen() calls
      sql/ha_federated.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_heap.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Simplify delete_table() and create() as the given file names are now without extension
      sql/ha_heap.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_innodb.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_innodb.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_myisam.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Remove not needed fn_format()
        Fixed for new table->s structure
      sql/ha_myisam.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_myisammrg.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Don't set 'is_view' for MERGE tables
        Use new interface to find_temporary_table()
      sql/ha_myisammrg.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Added flag HA_NO_COPY_ON_ALTER
      sql/ha_ndbcluster.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Fixed wrong calls to strxnmov()
        Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed
        drop_table -> intern_drop_table()
        table->s -> table_share
        Move part_info to TABLE
        Fixed comments & DBUG print's
        New arguments to print_error()
      sql/ha_ndbcluster.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_partition.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        We can't set up or use part_info when creating handler as there is not yet any table object
        New ha_intialise() to work with TDC (Done by Mikael)
      sql/ha_partition.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Got set_part_info() from Mikael
      sql/handler.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        ha_delete_table() now also takes database as an argument
        handler::ha_open() now takes TABLE as argument
        ha_open() now calls ha_allocate_read_write_set()
        Simplify ha_allocate_read_write_set()
        Remove ha_deallocate_read_write_set()
        Use table_share (Cached by table definition cache)
      sql/handler.h:
        New table flag: HA_NO_COPY_ON_ALTER (used by merge tables)
        Remove ha_deallocate_read_write_set()
        get_new_handler() now takes TABLE_SHARE as argument
        ha_delete_table() now gets database as argument
      sql/item.cc:
        table_name and db are now LEX_STRING objects
        When creating fields, we have now have to call field->init(table)
        move_field -> move_field_offset()
      sql/item.h:
        tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR
         instead of BLOB
      sql/item_cmpfunc.cc:
        Fixed call to tmp_table_field_from_field_type()
      sql/item_create.cc:
        Assert if new not handled cast type
      sql/item_func.cc:
        When creating fields, we have now have to call field->init(table)
        dummy_table used by 'sp' now needs a TABLE_SHARE object
      sql/item_subselect.cc:
        Trivial code cleanups
      sql/item_sum.cc:
        When creating fields, we have now have to call field->init(table)
      sql/item_timefunc.cc:
        Item_func_str_to_date::tmp_table_field() now replaced by call to
         tmp_table_field_from_field_type() (see item_timefunc.h)
      sql/item_timefunc.h:
        Simply tmp_table_field()
      sql/item_uniq.cc:
        When creating fields, we have now have to call field->init(table)
      sql/key.cc:
        Added 'KEY' argument to 'find_ref_key' to simplify code
      sql/lock.cc:
        More debugging
        Use create_table_def_key() to create key for table cache
        Allocate TABLE_SHARE properly when creating name lock
        Fix that locked_table_name doesn't test same table twice
      sql/mysql_priv.h:
        New functions for table definition cache
        New interfaces to a lot of functions.
        New faster interface to find_temporary_table() and close_temporary_table()
      sql/mysqld.cc:
        Added support for table definition cache of size 'table_def_size'
        Fixed som calls to strnmov()
        Changed name of 'table_cache' to 'table_open_cache'
      sql/opt_range.cc:
        Use new interfaces
        Fixed warnings from valgrind
      sql/parse_file.cc:
        Safer calls to strxnmov()
        Fixed typo
      sql/set_var.cc:
        Added variable 'table_definition_cache'
        Variable table_cache renamed to 'table_open_cache'
      sql/slave.cc:
        Use new interface
      sql/sp.cc:
        Proper use of TABLE_SHARE
      sql/sp_head.cc:
        Remove compiler warnings
        We have now to call field->init(table)
      sql/sp_head.h:
        Pointers to parsed strings are now const
      sql/sql_acl.cc:
        table_name is now a LEX_STRING
      sql/sql_base.cc:
        Main implementation of table definition cache
        (The #ifdef's are there for the future when table definition cache will replace open table cache)
        Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places
        Views are not yet cached; For the moment we only cache if a table is a view or not.
        
        Faster implementation of find_temorary_table()
        Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()'
        Drop table is slightly faster as we can use the table definition cache to know the type of the table
      sql/sql_cache.cc:
        table_cache_key and table_name are now LEX_STRING
        'sDBUG print fixes
      sql/sql_class.cc:
        table_cache_key is now a LEX_STRING
        safer strxnmov()
      sql/sql_class.h:
        Added number of open table shares (table definitions)
      sql/sql_db.cc:
        safer strxnmov()
      sql/sql_delete.cc:
        Use new interface to find_temporary_table()
      sql/sql_derived.cc:
        table_name is now a LEX_STRING
      sql/sql_handler.cc:
        TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
      sql/sql_insert.cc:
        TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
      sql/sql_lex.cc:
        Make parsed string a const (to quickly find out if anything is trying to change the query string)
      sql/sql_lex.h:
        Make parsed string a const (to quickly find out if anything is trying to change the query string)
      sql/sql_load.cc:
        Safer strxnmov()
      sql/sql_parse.cc:
        Better error if wrong DB name
      sql/sql_partition.cc:
        part_info moved to TABLE from TABLE_SHARE
        Indentation changes
      sql/sql_select.cc:
        Indentation fixes
        Call field->init(TABLE) for new created fields
        Update create_tmp_table() to use TABLE_SHARE properly
      sql/sql_select.h:
        Call field->init(TABLE) for new created fields
      sql/sql_show.cc:
        table_name is now a LEX_STRING
        part_info moved to TABLE
      sql/sql_table.cc:
        Use table definition cache to speed up delete of tables
        Fixed calls to functions with new interfaces
        Don't use 'share_not_to_be_used'
        Instead of doing openfrm() when doing repair, we now have to call
        get_table_share() followed by open_table_from_share().
        Replace some fn_format() with faster unpack_filename().
        Safer strxnmov()
        part_info is now in TABLE
        Added Mikaels patch for partition and ALTER TABLE
        Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER
      sql/sql_test.cc:
        table_name and table_cache_key are now LEX_STRING's
      sql/sql_trigger.cc:
        TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
        safer strxnmov()
        Removed compiler warnings
      sql/sql_update.cc:
        Call field->init(TABLE) after field is created
      sql/sql_view.cc:
        safer strxnmov()
        Create common TABLE_SHARE object for views to allow us to cache if table is a view
      sql/structs.h:
        Added SHOW_TABLE_DEFINITIONS
      sql/table.cc:
        Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects
        
        The table opening process now works the following way:
        - Create common TABLE_SHARE object
        - Read the .frm file and unpack it into the TABLE_SHARE object
        - Create a TABLE object based on the information in the TABLE_SHARE
          object and open a handler to the table object
        
        open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats
      sql/table.h:
        TABLE objects for the same database table now share a common TABLE_SHARE object
        In TABLE_SHARE the most common strings are now LEX_STRING's
      sql/unireg.cc:
        Changed arguments to rea_create_table() to have same order as other functions
        Call field->init(table) for new created fields
      sql/unireg.h:
        Added OPEN_VIEW
      strings/strxnmov.c:
        Change strxnmov() to always add end \0
        This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
      f631b361
  2. 22 Nov, 2005 5 commits
  3. 21 Nov, 2005 2 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 36dd2cf6
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new
      
      
      sql/lock.cc:
        Auto merged
      36dd2cf6
    • unknown's avatar
      BUG #14524 · 53319497
      unknown authored
      Post-review fixes to original changeset http://lists.mysql.com/internals/32422
      
      
      BUILD/SETUP.sh:
        BUG #14524
        
        Added flags to no-ndb build script to include archive.
      mysql-test/r/partition.result:
        BUG #14524 
        
        Post review mods to test results
      mysql-test/t/partition.test:
        BUG #14524
        
        Post review mods to test
      sql/ha_partition.cc:
        BUG# 14524
        
        Post review modifications to code - removed if, just pass m_no_locks
      53319497
  4. 20 Nov, 2005 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 64a81f01
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.1-new
      
      
      64a81f01
    • unknown's avatar
      ndb - bug#14007 5.1 (merge 5.0->5.1) · defa8e84
      unknown authored
      
      mysql-test/r/ndb_charset.result:
        bug#14007 5.1 (merge 5.0->5.1)
      mysql-test/t/ndb_charset.test:
        bug#14007 5.1 (merge 5.0->5.1)
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        bug#14007 5.1 (merge 5.0->5.1)
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        bug#14007 5.1 (merge 5.0->5.1)
      defa8e84
  5. 19 Nov, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-5.0-8568 · ca035724
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.1-new
      
      
      ca035724
    • unknown's avatar
      A fix for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when · 4ca413e9
      unknown authored
      COUNT(*) is 0" (the test case has been pushed already)
      
      
      sql/sql_cursor.cc:
        Fix a return of an unitialized variable: return_zero_rows
        checks the return value of send_fields and in case it's 1
        doesn't call send_data. This caused creation of an empty result 
        set for the case when there is a cursor against a select with a 
        group function and no matching rows.
      4ca413e9
    • unknown's avatar
      Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2, ndb_multi2, · a93a2a90
      unknown authored
      ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
      been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
      And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
      and so some brackets were missing which changed one test).
      Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
      please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.
      
      
      mysql-test/r/ndb_charset.result:
        "ul" in merge (Pekka please fix)
      mysql-test/t/ndb_charset.test:
        "ul" in merge (Pekka please fix)
      sql/sql_acl.cc:
        missing ()
      sql/sql_parse.cc:
        If thd->spcont is true, always replicate (as in 5.0) (bad old merge probably).
      a93a2a90
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 51972f1a
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
      
      
      51972f1a
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-5.0-van · 38069031
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
      (2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
      and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
      
      
      configure.in:
        Auto merged
      mysql-test/r/ndb_charset.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      mysys/base64.c:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/myisam/ft_parser.c:
        Auto merged
      storage/ndb/include/kernel/AttributeDescriptor.hpp:
        Auto merged
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
        Auto merged
      storage/ndb/tools/ndb_size.pl:
        Auto merged
      storage/ndb/tools/ndb_size.tmpl:
        Auto merged
      mysql-test/t/disabled.def:
        merge
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        used "ul", Pekka said he'll fix
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        used "ul", Pekka said he'll fix
      38069031
    • unknown's avatar
      BUG #14524 · 136c91dd
      unknown authored
      Patch that fixes crashing when partition uses blackole for 
      underlying tables.
      
      
      mysql-test/r/partition.result:
        BUG #14524 New test result
      mysql-test/t/partition.test:
        BUG #14524
        
        New test
      sql/ha_partition.cc:
        BUG# 14524
        
        Added new class var m_no_locks to keep track of the absense of locks. If 
        '0', then lock_count returns 0, which keeps thr_multi_lock from crashing
        in the case of the underlying table being ha_blackhole.
      sql/ha_partition.h:
        BUG #14524
        
        Added new class var m_no_locks to keep track of lock count
      sql/lock.cc:
        BUG #14524
        
        DBUG PRINTs and ENTERs to make tracking the bug easier. I think these are 
        useful regardless of this bug.
      sql/sql_partition.cc:
        BUG #14524
        
        Changed umlaut o to allow fixing bug 14524 using DDD (file would not display
        in DDD)
      136c91dd
  6. 18 Nov, 2005 12 commits
    • unknown's avatar
      Bug#13510 "Setting password local variable changes current · 6ba79a25
      unknown authored
      password": additional fix, also make sure that a syntax error is 
      returned for set names="foo" when there is no such variable or no
      stored procedure.
      
      
      mysql-test/r/sp-error.result:
        Test results fixed: a new test for Bug#13510
      mysql-test/t/sp-error.test:
        A new test for Bug#13510 (set names out of an SP)
      sql/sql_yacc.yy:
        Bug#13510: fix the case when there is no stored procedure or
        no 'names' variable declared. Return a syntax error in this case.
      6ba79a25
    • unknown's avatar
      A test case for Bug#8568 "GROUP_CONCAT returns string, unless in · a11caf1e
      unknown authored
      a UNION in which case returns BLOB". The bug is not present anymore.
      
      
      mysql-test/r/func_gconcat.result:
        Bug#8568: test results
      mysql-test/t/func_gconcat.test:
        Add a test case for Bug#8568
      a11caf1e
    • unknown's avatar
      fix after merge of 5.0 into 5.1 · a06f394e
      unknown authored
      
      sql/share/errmsg.txt:
        fix after merge
      sql/sql_show.cc:
        fix after merge
      a06f394e
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 43262f34
      unknown authored
      into moonbone.local:/work/13622-bug-5.0-mysql
      
      
      43262f34
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-5.0 · 41de6f9a
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
      I'll fix; I'll ask some devs to check their part)
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      storage/myisam/mi_key.c:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbImpl.hpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      configure.in:
        merge
      mysql-test/r/ps_1general.result:
        merge ("ul", will fix)
      sql/examples/ha_tina.cc:
        merge
      sql/ha_innodb.cc:
        merge
      sql/handler.h:
        merge
      sql/log.cc:
        merge
      sql/set_var.cc:
        merge
      sql/share/errmsg.txt:
        merge (bad, will fix)
      sql/sql_show.cc:
        merge (bad, will fix)
      sql/sql_yacc.yy:
        merge
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        merge
      41de6f9a
    • unknown's avatar
      A test case for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA · fe94b6bf
      unknown authored
      when COUNT(*) is 0". The bug itself cannot be repeated.
      
      
      mysql-test/r/sp.result:
        Test results were fixed (Bug#14845)
      mysql-test/t/sp.test:
        An SQL language test case for Bug#14845
      tests/mysql_client_test.c:
        A test case for Bug#14845
      fe94b6bf
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 18ca0d63
      unknown authored
      into moonbone.local:/work/13622-bug-5.0-mysql
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      18ca0d63
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 27b4c2a5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      27b4c2a5
    • unknown's avatar
      More authors. · 7a976f73
      unknown authored
      
      mysql-test/r/show_check.result:
        Test fix results.
      7a976f73
    • unknown's avatar
      WL#2486 - natural/using joins according to SQL:2003. · 28396247
      unknown authored
      Enabled view tests that didn't work before.
      
      
      mysql-test/r/view.result:
        Enabled natural outer join tests with views - now they work after WL#2486 was pushed.
      mysql-test/t/view.test:
        Enabled natural outer join tests with views - now they work after WL#2486 was pushed.
      28396247
    • unknown's avatar
      Fix mix_innodb_myisam_binlog test and results after merge · 39ceae40
      unknown authored
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        update results
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Update binlog test
      39ceae40
    • unknown's avatar
      Updated authors.h file (and show_check.result file) to include QA team members · f37c218d
      unknown authored
      Note: This change was reviewed by Brian before the commit.
      
      
      mysql-test/r/show_check.result:
        Updated result file
      sql/authors.h:
        Added QA team to the file
      f37c218d
  7. 17 Nov, 2005 12 commits