1. 17 Dec, 2004 1 commit
    • unknown's avatar
      Fix for bug #6849 "Crash while preparing query containing const expr with · bc152db5
      unknown authored
      IN and CONVERT_TZ()" (with after review changes).
      
      Now we add implicitly used time zone tables to global table list right
      at the parsing stage instead of doing it later in mysql_execute_command()
      or in check_prepared_statement().
      
      No special test-case needed since this bug also manifests itself as
      timezone2.test failure if one runs it with --ps-protocol option.
      
      
      sql/sql_base.cc:
        relink_tables_for_multidelete(): 
         presence of implicitly used time zone tables is no longer condition for
         propagation of TABLE pointers from global table list to local table
         lists (since now global list is always created...)
      sql/sql_lex.cc:
        - Added LEX::add_time_zone_tables_to_query_tables() function which adds
          implicitly used time zone tables to global table list.
        - Definition of fake_time_zone_tables_list moved to tztime.cc, since
          it is no longer used in parser.
      sql/sql_lex.h:
        - Since now we add implicitly used time zone tables right at parsing
          stage, LEX::time_zone_tables_used is either zero or points to valid
          time zone tables list. Updated its description to reflect that.
        - Added LEX::add_time_zone_tables_to_query_tables() function which adds
          implicitly used time zone tables to global table list.
        - Declaration of fake_time_zone_tables_list moved to tztime.h,
          since it is no longer used in parser.
      sql/sql_parse.cc:
        mysql_execute_command():
          Removed adding list of implicitly used time zone tables to global table
          list, since now we do this right at the parsing stage.
      sql/sql_yacc.yy:
        Let us add implicitly used time zone tables to global table list
        right at the parsing stage instead of doing it later in
        mysql_execute_command() or in check_prepared_statement().
      sql/tztime.cc:
        Moved fake_time_zone_tables_list definition from sql_lex.cc to
        tztime.cc since now it is used only for error reporting from
        my_tz_get_table_list() function.
      sql/tztime.h:
        Moved fake_time_zone_tables_list declaration from sql_lex.h to
        tztime.h since now it is used only for error reporting from
        my_tz_get_table_list() function.
      bc152db5
  2. 14 Dec, 2004 6 commits
  3. 13 Dec, 2004 4 commits
    • unknown's avatar
      Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; · 0a09408d
      unknown authored
      
      BitKeeper/etc/ignore:
        added extra/created_include_files
      extra/Makefile.am:
        Make sure that mysqld_error.h and sql_state.h are not build in the same time.
      extra/comp_err.c:
        Fixed segfault bug
      libmysqld/Makefile.am:
        Added path to mysqld_error.h and sql_state.h
      libmysqld/examples/Makefile.am:
        Added path to mysqld_error.h and sql_state.h
      scripts/make_win_src_distribution.sh:
        Windows version fix
      0a09408d
    • unknown's avatar
      Added missing errmsg.txt · 51c2c581
      unknown authored
      
      BitKeeper/etc/ignore:
        added extra/sql_state.h
      51c2c581
    • unknown's avatar
      WL#1051, more maintanable error messages. · 87275b28
      unknown authored
      
      BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7:
        Delete: include/mysqld_error.h
      BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019:
        Delete: include/sql_state.h
      BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
        Delete: sql/share/czech/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
        Delete: sql/share/danish/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
        Delete: sql/share/dutch/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
        Delete: sql/share/french/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
        Delete: sql/share/estonian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
        Delete: sql/share/greek/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
        Delete: sql/share/german/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
        Delete: sql/share/english/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
        Delete: sql/share/norwegian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
        Delete: sql/share/italian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
        Delete: sql/share/korean/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
        Delete: sql/share/japanese/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
        Delete: sql/share/hungarian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
        Delete: sql/share/portuguese/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
        Delete: sql/share/polish/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
        Delete: sql/share/norwegian-ny/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
        Delete: sql/share/romanian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
        Delete: sql/share/russian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
        Delete: sql/share/serbian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
        Delete: sql/share/slovak/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
        Delete: sql/share/swedish/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
        Delete: sql/share/spanish/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
        Delete: sql/share/ukrainian/errmsg.txt
      client/Makefile.am:
        Added pass to mysqld_error.j and sql_state.h
      extra/Makefile.am:
        Added rules to create mysqld_error.h and sql_state.h
      extra/comp_err.c:
        WL#1051
      include/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      libmysql/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      libmysql_r/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      server-tools/instance-manager/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      sql/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      sql/share/Makefile.am:
        Removed unnecessary loop over all languages; addred rule to creat <lang>.sys files
      tools/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      87275b28
    • unknown's avatar
      flush_read_lock_kill-master.opt: · c4dc0c25
      unknown authored
        don't make non-debug builds fail the testsuite
      
      
      mysql-test/t/flush_read_lock_kill-master.opt:
        don't make non-debug builds fail the testsuite
      c4dc0c25
  4. 12 Dec, 2004 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b9520662
      unknown authored
      into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
      
      
      b9520662
    • unknown's avatar
      fix autobuild failures · 596876f9
      unknown authored
      
      server-tools/instance-manager/buffer.cc:
        fix typo
      server-tools/instance-manager/commands.cc:
        get rid of compiler warnings
      server-tools/instance-manager/guardian.cc:
        fix compiler warning
      server-tools/instance-manager/instance.cc:
        fix warnings
      server-tools/instance-manager/instance_map.cc:
        fix return value
      server-tools/instance-manager/instance_map.h:
        fix problem, caused autobuild failure. Looks like a gcc problem - 
        "friend class <name>" doesn't work if specified before enclosed class
        <name> (this is not present in newer gcc versions)
      596876f9
    • unknown's avatar
      Fix test results that may change from run to run · 5ae35e32
      unknown authored
      Added comments (from code review on pull)
      
      
      mysql-test/r/heap.result:
        Fix results that may change from run to run
      mysql-test/r/ps_5merge.result:
        Fix wrong result
      mysql-test/t/heap.test:
        Make results predictable
      sql/sql_show.cc:
        Add comments
        Fixed typo
      5ae35e32
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 47c39015
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      47c39015
  5. 10 Dec, 2004 6 commits
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 57867f07
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
      
      
      57867f07
    • unknown's avatar
      fix according to review · 6bcee4f1
      unknown authored
      6bcee4f1
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9d946e8a
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      
      
      9d946e8a
    • unknown's avatar
      InnoDB: Reduce the stack space consumption of ON UPDATE CASCADE · 0404a607
      unknown authored
      operations.
      
      
      innobase/include/lock0lock.h:
        Added lock_clust_rec_read_check_and_lock_alt(),
        a variant of lock_clust_rec_read_check_and_lock()
        without the parameter "offsets".
      innobase/lock/lock0lock.c:
        Added lock_clust_rec_read_check_and_lock_alt(),
        a variant of lock_clust_rec_read_check_and_lock()
        without the parameter "offsets".
      innobase/row/row0ins.c:
        row_ins_foreign_check_on_constraint(): Do not allocate offsets
        from stack. This reduces the stack space consumption of
        ON UPDATE CASCADE operations by 400 bytes per cascaded UPDATE
        operation.
      0404a607
    • unknown's avatar
      Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges · c7d7c9ca
      unknown authored
      mysqldump skips information_schema db
      'use' now can use information_schema db
      changed value of column 'Null' to 'NO' if column is not nullable
      
      
      client/mysqldump.c:
        mysqldump skips information_schema db
      mysql-test/r/alter_table.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/create.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ctype_collate.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ctype_recoding.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ctype_ujis.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/drop.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/func_sapdb.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/func_time.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/gis.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/information_schema.result:
        Added couple of tests
      mysql-test/r/information_schema_inno.result:
        Removed coulmn 'CONTRAINT_METOD' from TABLE_CONSTRAINTS
        Added column 'POSITION_IN_UNIQUE_CONSTRAINT' to KEY_COLUMN_USAGE
      mysql-test/r/innodb.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ndb_autodiscover.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ps_1general.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/rpl000009.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/rpl_create_database.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/schema.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/select.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/show_check.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/sp.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/type_enum.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/type_ranges.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/t/information_schema.test:
        Added couple of tests
      sql/sql_acl.cc:
        Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
      sql/sql_db.cc:
        'use' now can use information_schema db
      sql/sql_show.cc:
        code cleanup
        informaton_schema(IS) db now contains data about IS itself
      sql/sql_yacc.yy:
        A fix(wrong behavour of 'SHOW COLUMNS, SHOW KEYS' with 'where condition')
      c7d7c9ca
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3a2d0371
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      3a2d0371
  6. 09 Dec, 2004 9 commits
    • unknown's avatar
      instance.cc: · 6f8ca251
      unknown authored
        explicit setting of reconnect (no behaviour change)
      
      
      server-tools/instance-manager/instance.cc:
        explicit setting of reconnect (no behaviour change)
      6f8ca251
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2fb4a502
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      
      2fb4a502
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · a5286aa9
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      
      client/mysqltest.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      tests/client_test.c:
        Auto merged
      a5286aa9
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · eed23437
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      
      
      eed23437
    • unknown's avatar
      Changing the default of libmysqlclient : it's now NO reconnection. · 40c2a887
      unknown authored
      All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
      made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
      All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
      and fixes BUG#2555.
      
      
      VC++Files/libmysqltest/mytest.c:
        explicit mention of reconnect (no behaviour change)
      VC++Files/mysqlmanager/mysqlmanagerview.cpp:
        explicit mention of reconnect (no behaviour change)
      VC++Files/test1/mysql_thr.c:
        explicit mention of reconnect (no behaviour change)
      VC++Files/winmysqladmin/main.cpp:
        explicit mention of reconnect (no behaviour change)
      client/mysql.cc:
        explicit mention of reconnect if embedded (no behaviour change)
      client/mysqladmin.cc:
        explicit mention of reconnect (no behaviour change)
      client/mysqlbinlog.cc:
        explicit mention of reconnect (no behaviour change)
      client/mysqlcheck.c:
        explicit mention of reconnect (no behaviour change)
      client/mysqlimport.c:
        explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
        and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
        does LOCK TABLES where we mustn't reconnect...
      client/mysqlshow.c:
        explicit mention of reconnect (no behaviour change)
      client/mysqltest.c:
        explicit mention of reconnect (no behaviour change).
        Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
        but 5.0 is too touchy to change it now. I'm marking it TODO.
      libmysql/libmysql.c:
        explicit mention of reconnect (no behaviour change)
      libmysqld/examples/builder-sample/emb_samples.cpp:
        explicit mention of reconnect (no behaviour change)
      ndb/test/ndbapi/flex_bench_mysql.cpp:
        explicit mention of reconnect (no behaviour change)
      ndb/tools/restore/consumer_restorem.cpp:
        explicit mention of reconnect (no behaviour change)
      sql-common/client.c:
        Changing the default of libmysqlclient : it's now NO reconnection.
      sql/repl_failsafe.cc:
        explicit mention of reconnect (no behaviour change)
      sql/slave.cc:
        explicit mention of reconnect (no behaviour change)
      tests/client_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/connect_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/deadlock_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/insert_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/list_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/select_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/showdb_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/ssl_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/thread_test.c:
        explicit mention of reconnect (no behaviour change)
      tools/mysqlmanager.c:
        explicit mention of reconnect (no behaviour change)
      40c2a887
    • unknown's avatar
      InnoDB: Changed interface to rec_get_offsets(), to reduce the use of · 7945222c
      unknown authored
      memory heaps.  This changeset plugs also a few memory leaks that
      were introduced with the compact InnoDB table format.
      
      
      innobase/btr/btr0btr.c:
        Changed interface to rec_get_offsets()
      innobase/btr/btr0cur.c:
        Changed interface to rec_get_offsets()
      innobase/btr/btr0pcur.c:
        Changed interface to rec_get_offsets()
      innobase/btr/btr0sea.c:
        Changed interface to rec_get_offsets()
      innobase/include/rem0rec.h:
        Changed interface to rec_get_offsets()
      innobase/include/rem0rec.ic:
        Changed interface to rec_get_offsets()
      innobase/lock/lock0lock.c:
        Changed interface to rec_get_offsets()
      innobase/page/page0cur.c:
        Changed interface to rec_get_offsets()
      innobase/page/page0page.c:
        Changed interface to rec_get_offsets()
      innobase/rem/rem0rec.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0ins.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0mysql.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0purge.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0row.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0sel.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0umod.c:
        Changed interface to rec_print()
      innobase/row/row0undo.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0upd.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0vers.c:
        Changed interface to rec_get_offsets()
      innobase/trx/trx0rec.c:
        Changed interface to rec_get_offsets()
      7945222c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 450ac341
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      450ac341
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 89e77b65
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im/mysql-5.0-im
      
      
      89e77b65
    • unknown's avatar
      merge · f7ef17dd
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      server-tools/instance-manager/mysqlmanager.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      f7ef17dd
  7. 08 Dec, 2004 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0d12a95d
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      0d12a95d
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 04ddb612
      unknown authored
      into mysql.com:/home/mydev/mysql-5.0-5000
      
      
      04ddb612
    • unknown's avatar
      A fix for a crash in sp.test with -debug-max. · b80db00e
      unknown authored
      When the joins were not cleaned up before the tables
      were closed, a JOIN_TAB still held a pointer to a
      meanwhile closed table and tried to close it again
      during item cleanup...
      
      
      b80db00e
    • unknown's avatar
      InnoDB: Make btr_search_drop_page_hash_index() work with the compact · f9bd116c
      unknown authored
      record format without requiring the doubly linked list added by
      Heikki in ChangeSet@1.1627.16.2
      
      
      innobase/btr/btr0sea.c:
        btr_search_drop_page_hash_index(): support the compact record format
      innobase/ibuf/ibuf0ibuf.c:
        ibuf_insert_to_index_page(): Remove unnecessary computation of
        field offsets.
      innobase/row/row0ins.c:
        row_ins_index_entry_low(): Remove unnecessary computation of
        field offsets.
      f9bd116c
    • unknown's avatar
      Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20041027124510|04970 · 746799fb
      unknown authored
      
      innobase/btr/btr0sea.c:
        Exclude
      innobase/buf/buf0buf.c:
        Exclude
      innobase/buf/buf0lru.c:
        Exclude
      innobase/ha/ha0ha.c:
        Exclude
      innobase/include/buf0buf.h:
        Exclude
      innobase/include/ha0ha.h:
        Exclude
      innobase/include/hash0hash.h:
        Exclude
      746799fb
    • unknown's avatar
      row0mysql.c: · ff2c115b
      unknown authored
        Remove parameter from call to btr_search_validate().
      buf0buf.c:
        Initialize member "index" of buf_block_t.
      buf0buf.h:
        Add member "index" to buf_block_t.
      btr0sea.h:
        Remove parameter of btr_search_validate()
      btr0sea.c:
        Make use of the added member "index" of buf_block_t.
      
      
      innobase/btr/btr0sea.c:
        Make use of the added member "index" of buf_block_t.
      innobase/include/btr0sea.h:
        Remove parameter of btr_search_validate()
      innobase/include/buf0buf.h:
        Add member "index" to buf_block_t.
      innobase/buf/buf0buf.c:
        Initialize member "index" of buf_block_t.
      innobase/row/row0mysql.c:
        Remove parameter from call to btr_search_validate().
      ff2c115b
    • unknown's avatar
      - VARCHAR(n) with binary character set is now displayed as VARBINARY(N). · 22b16624
      unknown authored
      - CREATE TABLE t1 SELECT BINARY 'literal'
        now creates a VARBINARY() column, not a BINARY().
      
      
      22b16624
  8. 07 Dec, 2004 3 commits