1. 22 Mar, 2004 1 commit
    • unknown's avatar
      union.result: · c64c493f
      unknown authored
         A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
      union.test:
        A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
      sql_union.cc:
        A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064)
      
      
      sql/sql_union.cc:
        A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064)
      mysql-test/t/union.test:
        A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
      mysql-test/r/union.result:
         A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
      c64c493f
  2. 15 Mar, 2004 2 commits
  3. 13 Mar, 2004 4 commits
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.0 · 4f27d6eb
      unknown authored
      into hundin.mysql.fi:/home/marko/l/mysql-4.0
      
      4f27d6eb
    • unknown's avatar
      InnoDB: Replace ut_a(0) with ut_error · 80a5f391
      unknown authored
      
      innobase/btr/btr0btr.c:
        Replace ut_a(0) with ut_error
      innobase/buf/buf0flu.c:
        Replace ut_a(0) with ut_error
      innobase/buf/buf0lru.c:
        Replace ut_a(0) with ut_error
      innobase/data/data0data.c:
        Replace ut_a(0) with ut_error
      innobase/dict/dict0crea.c:
        Replace ut_a(0) with ut_error
      innobase/dict/dict0dict.c:
        Replace ut_a(0) with ut_error
      innobase/dict/dict0load.c:
        Replace ut_a(0) with ut_error
      innobase/fil/fil0fil.c:
        Replace ut_a(0) with ut_error
      innobase/fsp/fsp0fsp.c:
        Replace ut_a(0) with ut_error
      innobase/ibuf/ibuf0ibuf.c:
        Replace ut_a(0) with ut_error
      innobase/include/buf0buf.ic:
        Replace ut_a(0) with ut_error
      innobase/include/data0type.ic:
        Replace ut_a(0) with ut_error
      innobase/include/mtr0log.ic:
        Replace ut_a(0) with ut_error
      innobase/include/trx0rseg.ic:
        Replace ut_a(0) with ut_error
      innobase/lock/lock0lock.c:
        Replace ut_a(0) with ut_error
      innobase/log/log0log.c:
        Replace ut_a(0) with ut_error
      innobase/log/log0recv.c:
        Replace ut_a(0) with ut_error
      innobase/mem/mem0pool.c:
        Replace ut_a(0) with ut_error
      innobase/mtr/mtr0log.c:
        Replace ut_a(0) with ut_error
      innobase/os/os0file.c:
        Replace ut_a(0) with ut_error
      innobase/page/page0cur.c:
        Replace ut_a(0) with ut_error
      innobase/page/page0page.c:
        Replace ut_a(0) with ut_error
      innobase/pars/lexyy.c:
        Replace ut_a(0) with ut_error
      innobase/que/que0que.c:
        Replace ut_a(0) with ut_error
      innobase/rem/rem0cmp.c:
        Replace ut_a(0) with ut_error
      innobase/rem/rem0rec.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0ins.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0mysql.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0purge.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0row.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0sel.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0undo.c:
        Replace ut_a(0) with ut_error
      innobase/srv/srv0srv.c:
        Replace ut_a(0) with ut_error
      innobase/sync/sync0arr.c:
        Replace ut_a(0) with ut_error
      innobase/trx/trx0purge.c:
        Replace ut_a(0) with ut_error
      innobase/trx/trx0trx.c:
        Replace ut_a(0) with ut_error
      innobase/trx/trx0undo.c:
        Replace ut_a(0) with ut_error
      80a5f391
    • unknown's avatar
      after merge fixes. · 2bc08cbe
      unknown authored
      2bc08cbe
    • unknown's avatar
      multi_update.result: · fe544498
      unknown authored
        Fix for a bug in the result
      multi_update.test:
        Fix for a bug in the test
      
      
      mysql-test/t/multi_update.test:
        Fix for a bug in the test
      mysql-test/r/multi_update.result:
        Fix for a bug in the result
      fe544498
  4. 12 Mar, 2004 13 commits
  5. 11 Mar, 2004 20 commits
    • unknown's avatar
      Merge · d9bbf9d3
      unknown authored
      
      mysql-test/install_test_db.sh:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      mysql-test/mysql-test-run.sh:
        SCCS merged
      d9bbf9d3
    • unknown's avatar
      Merge with 3.23 to get patch for floor() · 1d4638e4
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      myisam/mi_check.c:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      mysql-test/t/func_math.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      1d4638e4
    • unknown's avatar
      Ensure that install_test_db.sh script works with both 'make install' and... · 7b18a6d1
      unknown authored
      Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts
      Abort if we can't allocate memory for table cache
      Fix bug with multi-update-tables and BDB tables.
      
      
      extra/replace.c:
        Fix comments
      mysql-test/install_test_db.sh:
        Change internal option from -bin to --bin
        Ensure that script works with both 'make install' and 'make_binary_distribution' layouts (Bug #3031)
      mysql-test/mysql-test-run.sh:
        Change internal option from -bin to --bin
      sql/ha_berkeley.cc:
        More debug
      sql/mysql_priv.h:
        Change table_cache_init to return error
      sql/mysqld.cc:
        Abort if we can't allocate memory for table cache. (Bug #3085)
        Enable warnings by default
      sql/sql_base.cc:
        Change table_cache_init to return error
      sql/sql_update.cc:
        Fix bug with multi-update-tables and BDB tables. Bug #3098
        Problem was that we didn't initialize BDB for calls to rnd_pos()
      7b18a6d1
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.0 · 3e7ca673
      unknown authored
      into hundin.mysql.fi:/home/marko/l/mysql-4.0
      
      3e7ca673
    • unknown's avatar
      More consistent handling of magic numbers · aa796b2d
      unknown authored
      
      innobase/include/data0data.h:
        dtuple_struct:magic_n: Enclose in #ifdef UNIV_DEBUG
      innobase/dict/dict0dict.c:
        Use magic_n only #ifdef UNIV_DEBUG
      innobase/dict/dict0mem.c:
        Use magic_n only #ifdef UNIV_DEBUG
      innobase/ha/hash0hash.c:
        Remove unused functions hash_mutex_enter_all and hash_mutex_exit_all
        Use magic_n only #ifdef UNIV_DEBUG
        Add ut_ad(table->magic_n == HASH_TABLE_MAGIC_N)
      innobase/include/dict0mem.h:
        Use magic_n only #ifdef UNIV_DEBUG
      innobase/include/hash0hash.h:
        Remove unused functions hash_mutex_enter_all and hash_mutex_exit_all
        Use magic_n only #ifdef UNIV_DEBUG
      innobase/include/hash0hash.ic:
        Add ut_ad(table->magic_n == HASH_TABLE_MAGIC_N)
      innobase/include/mtr0mtr.h:
        Use state, magic_n only #ifdef UNIV_DEBUG
      innobase/include/row0ins.h:
        Use magic_n only #ifdef UNIV_DEBUG
      innobase/include/row0upd.h:
        Use magic_n only #ifdef UNIV_DEBUG
      innobase/row/row0ins.c:
        Use magic_n only #ifdef UNIV_DEBUG
        Add ut_ad(node->magic_n == INS_NODE_MAGIC_N)
      innobase/row/row0upd.c:
        Use magic_n only #ifdef UNIV_DEBUG
        Add ut_ad(node->magic_n == UPD_NODE_MAGIC_N)
      innobase/thr/thr0loc.c:
        Use magic_n only #ifdef UNIV_DEBUG
      aa796b2d
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 · f9b61275
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.0
      
      f9b61275
    • unknown's avatar
      multi_update.result: · e657a607
      unknown authored
        Test case for a #2996 bug fix
      multi_update.test:
        test case for a #2996 bug fix
      sql_select.cc:
        Fix for a bug #2996 involving multi-table updates over the const tables
      
      
      sql/sql_select.cc:
        Fix for a bug #2996 involving multi-table updates over the const tables
      mysql-test/t/multi_update.test:
        test case for a #2996 bug fix
      mysql-test/r/multi_update.result:
        Test case for a #2996 bug fix
      e657a607
    • unknown's avatar
      Fixed error in version. · f9be0095
      unknown authored
      f9be0095
    • unknown's avatar
      Fix for BUG#2983 "If statement was killed on master, slave errors despite replicate-wild-ignore-t" · 865685d5
      unknown authored
      We introduce a new function mysql_test_parse_for_slave().
      If the slave sees that the query got a really bad error on master
      (killed e.g.), then it calls this function to know if this query
      can be ignored because of replicate-*-table rules (do not worry
      about replicate-*-db rules: they are checked so early that they have
      no bug). If the answer is yes, it skips the query and continues. If
      it's no, then it stops and say "fix your slave data manually" (like it
      did before this change).
      
      
      mysql-test/r/rpl_error_ignored_table.result:
        result update
      mysql-test/t/rpl_error_ignored_table-slave.opt:
        ignore more tables
      mysql-test/t/rpl_error_ignored_table.test:
        we test if a killed query on the master, is ignored on the slave
        if the tables it involves should be excluded because of replicate-*-table
        rules.
      sql/log_event.cc:
        If the query got a really bad error on the master (thread killed etc),
        parse it to test the table names: if the replicate-*-do|ignore-table
        rules say "this query must be ignored" then we exit gracefully;
        otherwise we warn about the bad error and tell DBA to check/fix it.
        Before this change, we always warned and stopped.
      sql/mysql_priv.h:
        new function
      sql/slave.cc:
        don't print error immediately as we need to do one more test to
        be sure.
      sql/sql_parse.cc:
        we add a function mysql_test_parse_for_slave(), to be used only
        by the slave if it wants to know if the query should be ignored or not;
        so this function only parses the query, does not execute it.
      865685d5
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · ced81972
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      sql/set_var.cc:
        Auto merged
      ced81972
    • unknown's avatar
      Fix for BUG#2921 "Replication problem on mutex lock in mySQL-4.0.18": · 92fe7556
      unknown authored
      re-using unused LOCK_active_mi to serialize all administrative
      commands related to replication:
      START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave()
      (replication autostart at server startup), end_slave() (replication
      autostop at server shutdown), LOAD DATA FROM MASTER.
      This protects us against a handful of deadlocks (like BUG#2921
      when two START SLAVE, but when two STOP SLAVE too).
      Removing unused variables.
      
      
      sql/item_func.cc:
        We don't need LOCK_active_mi just to MASTER_POS_WAIT().
      sql/repl_failsafe.cc:
        no need for macro
      sql/set_var.cc:
        no need for macro
      sql/slave.cc:
        Re-using unused LOCK_active_mi to serialize all administrative
        commands related to replication:
        START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave()
        (replication autostart at server startup), end_slave() (replication
        autostop at server shutdown), LOAD DATA FROM MASTER.
        This protects us against a handful of deadlocks.
        Removing unused variables.
      sql/slave.h:
        Re-using LOCK_active_mi to serialize administrative replication commands.
        Macros unneeded. Removing unneeded variables.
      sql/sql_parse.cc:
        found unused variable.
        Replacing macros.
      sql/sql_show.cc:
        replacing macros
      92fe7556
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.0 · 667577a1
      unknown authored
      into hundin.mysql.fi:/home/marko/l/mysql-4.0
      
      667577a1
    • unknown's avatar
      Remove remaining references to the built-in ODBC driver of InnoDB · 186496c9
      unknown authored
      
      BitKeeper/deleted/.del-ib_odbc.h~6882a6fe66f9b3e:
        Delete: innobase/include/ib_odbc.h
      BitKeeper/deleted/.del-odbc0odbc.h~6cdf5ecedbf3b3f0:
        Delete: innobase/include/odbc0odbc.h
      innobase/include/Makefile.am:
        Remove odbc0odbc.h and ib_odbc.h
      innobase/srv/srv0srv.c:
        Remove reference to odbc0odbc.h
      innobase/include/pars0pars.h:
        Remove unused functions related to ODBC and stored procedures
        Made pars_print_lexed conditional [UNIV_SQL_DEBUG]
      innobase/pars/pars0pars.c:
        Remove unused functions related to ODBC and stored procedures
        Made pars_print_lexed conditional [UNIV_SQL_DEBUG]
        Output to stderr instead of stdout
      186496c9
    • unknown's avatar
      Remove libcom.a from acinclude.m4 (should have been done in ChangeSet 1.1741) · 4e030ad1
      unknown authored
      
      acinclude.m4:
        innodb_libs: Remove libcom.a
      4e030ad1
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 · e3e4cb26
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.0
      
      e3e4cb26
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0 · ea386937
      unknown authored
      into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0
      
      ea386937
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.0 · dcc52970
      unknown authored
      into hundin.mysql.fi:/home/marko/l/mysql-4.0
      
      dcc52970
    • unknown's avatar
      Small fixes. · e6270d31
      unknown authored
      
      client/mysqlbinlog.cc:
        Patched patch for Bug#2491.
      sql/set_var.cc:
        Added max_insert_delayed_threads into 'SHOW VARIABLES'.
      e6270d31
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 · 022d0d7d
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
      
      022d0d7d
    • unknown's avatar
      mysqldump.c: · 2bb0ed05
      unknown authored
        reverting fix
      
      
      client/mysqldump.c:
        reverting fix
      2bb0ed05