1. 23 Jul, 2004 4 commits
    • unknown's avatar
      merge · d7831eb8
      unknown authored
      
      sql/sql_base.cc:
        Auto merged
      d7831eb8
    • unknown's avatar
      fixed using VIEW fields (BUG#4617) · f5328c02
      unknown authored
      
      mysql-test/r/view.result:
        using VIEW fields several times in query resolved via temporary tables
      mysql-test/t/view.test:
        using VIEW fields several times in query resolved via temporary tables
      sql/item.h:
        fixed using of result_field by Item_ref
      sql/sql_base.cc:
        Create Item_ref as reference on VIEW fields expression reference
      sql/sql_insert.cc:
        privent creating Item_ref in insert list (where Item_fields should be)
      sql/sql_lex.cc:
        Item_ref creation control
      sql/sql_lex.h:
        Item_ref creation control
      sql/sql_update.cc:
        privent creating Item_ref in insert list (where Item_fields should be) and creation Item_fields for UPDATE list
      sql/table.cc:
        Do not create Item_ref for internal view of view processing
      f5328c02
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · cbc85809
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      cbc85809
    • unknown's avatar
      Merge · 3a45f6bb
      unknown authored
      
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      3a45f6bb
  2. 22 Jul, 2004 5 commits
    • unknown's avatar
      made different fields for view updatebility in principle and updatability... · af14cae0
      unknown authored
      made different fields for view updatebility in principle and updatability during this execution (BUG#4601)
      
      
      mysql-test/r/view.result:
        fixed ps variavles test
        test of view built over updatable view
      mysql-test/t/view.test:
        fixed ps variavles test
        test of view built over updatable view
      sql/sql_acl.cc:
        mpre optimal locking (found by Monty)
      sql/sql_view.cc:
        made different fields for view updatebility in principle and updatability during this execution
      sql/table.h:
        made different fields for view updatebility in principle and updatability during this execution
      af14cae0
    • unknown's avatar
      Fixed BUG#4579: Execution of SP crashes server. · c6b52e9b
      unknown authored
      Sub-CALLs of procedures zapped thd->current_arena for good.
      
      
      mysql-test/r/sp.result:
        New test case for BUG#4579.
      mysql-test/t/sp.test:
        New test case for BUG#4579.
      sql/sp_head.cc:
        Keep and restore old thd->current_arena before/after executing an SP,
        instead of just setting it to 0 afterwards.
      c6b52e9b
    • unknown's avatar
      fixed SP variables detecting (BUG#4604) · e660728d
      unknown authored
      fixed error handling
      
      
      mysql-test/r/view.result:
        SP variables inside view test
      mysql-test/t/view.test:
        SP variables inside view test
      sql/sql_base.cc:
        fixed error messages handling
      sql/sql_yacc.yy:
        fixed SP variables detecting
      e660728d
    • unknown's avatar
      privent crash on temporary table during indexes lookup (BUG#4677) · f485c2f6
      unknown authored
      
      mysql-test/r/view.result:
        check 'use index' on view with temporary table
      mysql-test/t/view.test:
        check 'use index' on view with temporary table
      sql/sql_base.cc:
        privent crash on temporary table
      f485c2f6
    • unknown's avatar
      fix lock_multi · 5cc289e9
      unknown authored
      
      sql/sql_base.cc:
        table_desc can be 0
      5cc289e9
  3. 21 Jul, 2004 14 commits
    • unknown's avatar
      after merge fixes 2 · 59e233ed
      unknown authored
      59e233ed
    • unknown's avatar
      after merge fixes · d69d2b57
      unknown authored
      
      sql/opt_range.h:
        compatibility fix
      sql/sql_lex.cc:
        cleanup
      d69d2b57
    • unknown's avatar
      merged · ee6b36ab
      unknown authored
      
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      ee6b36ab
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 8da3aa06
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      8da3aa06
    • unknown's avatar
      LEX initialization fixed · c01ac908
      unknown authored
      c01ac908
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 7dc2f74c
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      7dc2f74c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 7358d912
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      7358d912
    • unknown's avatar
      fixed ORDER BY ? · bfaf9b0c
      unknown authored
      new tests to ensure that prepared statement *really* work
      (and that MySQL not picks up some number from arbitrary location
      that happens to match the parameter's value)
      
      
      mysql-test/include/ps_query.inc:
        new tests to ensure that prepared statement *really* work
        (and that MySQL not picks up some number from arbitrary location
        that happens to match the parameter's value)
      mysql-test/r/ps_2myisam.result:
        results updated
      mysql-test/r/ps_3innodb.result:
        results updated
      mysql-test/r/ps_4heap.result:
        results updated
      mysql-test/r/ps_5merge.result:
        results updated
      mysql-test/r/ps_6bdb.result:
        results updated
      sql/sql_select.cc:
        don't shortcut - it backfires!
        (in particular - when itemptr is Item_param :)
      bfaf9b0c
    • unknown's avatar
      Final patch for WL#1600(warn if max_allowed_packet used) · dbdca81c
      unknown authored
      
      mysql-test/r/func_str.result:
        test fixed
      mysql-test/r/packet.result:
        test fixed
      sql/item_geofunc.cc:
        error message fixed
      sql/item_strfunc.cc:
        error message fixed
      sql/share/czech/errmsg.txt:
        error message fixed
      sql/share/danish/errmsg.txt:
        error message fixed
      sql/share/dutch/errmsg.txt:
        error message fixed
      sql/share/english/errmsg.txt:
        error message fixed
      sql/share/estonian/errmsg.txt:
        error message fixed
      sql/share/french/errmsg.txt:
        error message fixed
      sql/share/german/errmsg.txt:
        error message fixed
      sql/share/greek/errmsg.txt:
        error message fixed
      sql/share/hungarian/errmsg.txt:
        error message fixed
      sql/share/italian/errmsg.txt:
        error message fixed
      sql/share/japanese/errmsg.txt:
        error message fixed
      sql/share/korean/errmsg.txt:
        error message fixed
      sql/share/norwegian-ny/errmsg.txt:
        error message fixed
      sql/share/norwegian/errmsg.txt:
        error message fixed
      sql/share/polish/errmsg.txt:
        error message fixed
      sql/share/portuguese/errmsg.txt:
        error message fixed
      sql/share/romanian/errmsg.txt:
        error message fixed
      sql/share/russian/errmsg.txt:
        error message fixed
      sql/share/serbian/errmsg.txt:
        error message fixed
      sql/share/slovak/errmsg.txt:
        error message fixed
      sql/share/spanish/errmsg.txt:
        error message fixed
      sql/share/swedish/errmsg.txt:
        error message fixed
      sql/share/ukrainian/errmsg.txt:
        error message fixed
      dbdca81c
    • unknown's avatar
      Merging · 291fec68
      unknown authored
      
      mysql-test/r/func_str.result:
        Auto merged
      sql/item_geofunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      291fec68
    • unknown's avatar
      Fixed BUG#2653: Undeclared variables not detected in stored procedures. · 76bc6b76
      unknown authored
      We now get an run-time error instead of a crash (although a slightly misleading
      error message, but it's an improvement).
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#2653.
      mysql-test/t/sp-error.test:
        New test case for BUG#2653.
      sql/sp_head.cc:
        Detect failed evals (fix item really), which are due to unresolved variables/fields.
        Typically this would be a reference to an undeclared variable.
        (Also got rid of some compiler warnings.)
      sql/sp_rcontext.cc:
        Detect failed evals (fix item really), which are due to unresolved variables/fields.
        Typically this would be a reference to an undeclared variable.
      sql/sp_rcontext.h:
        Changed return type to int, so be able to detect failed evals (fix item).
      sql/sql_class.cc:
        Changed return type to int, so be able to detect failed evals (fix item).
      76bc6b76
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · cad46d55
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-2-5.0
      
      cad46d55
    • unknown's avatar
      test of duplicate field names (BUG#4608) · 1847464b
      unknown authored
      
      mysql-test/r/view.result:
        test of duplicate field names
      mysql-test/t/view.test:
        test of duplicate field names
      sql/sql_view.cc:
        test of duplicate field names
      1847464b
    • unknown's avatar
      error message interception (Bug#4598) · b1cc9782
      unknown authored
      error handling of view initialization fixed (Bug#4599)
      
      
      include/mysqld_error.h:
        new error message
      mysql-test/r/view.result:
        changing of underlaying table test
      mysql-test/t/view.test:
        changing of underlaying table test
      sql/share/czech/errmsg.txt:
        new error message
      sql/share/danish/errmsg.txt:
        new error message
      sql/share/dutch/errmsg.txt:
        new error message
      sql/share/english/errmsg.txt:
        new error message
      sql/share/estonian/errmsg.txt:
        new error message
      sql/share/french/errmsg.txt:
        new error message
      sql/share/german/errmsg.txt:
        new error message
      sql/share/greek/errmsg.txt:
        new error message
      sql/share/hungarian/errmsg.txt:
        new error message
      sql/share/italian/errmsg.txt:
        new error message
      sql/share/japanese/errmsg.txt:
        new error message
      sql/share/korean/errmsg.txt:
        new error message
      sql/share/norwegian-ny/errmsg.txt:
        new error message
      sql/share/norwegian/errmsg.txt:
        new error message
      sql/share/polish/errmsg.txt:
        new error message
      sql/share/portuguese/errmsg.txt:
        new error message
      sql/share/romanian/errmsg.txt:
        new error message
      sql/share/russian/errmsg.txt:
        new error message
      sql/share/serbian/errmsg.txt:
        new error message
      sql/share/slovak/errmsg.txt:
        new error message
      sql/share/spanish/errmsg.txt:
        new error message
      sql/share/swedish/errmsg.txt:
        new error message
      sql/share/ukrainian/errmsg.txt:
        new error message
      sql/sql_base.cc:
        error message interception
        error handling fixed
      sql/sql_view.cc:
        comment fixed
        error message interception
      sql/table.cc:
        error message interception
      sql/table.h:
        error message interception
      b1cc9782
  4. 20 Jul, 2004 17 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 5c4f8358
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-874
      
      5c4f8358
    • unknown's avatar
      Sanja will probably rework this tomorrow; we need to unify the normal · e671c80b
      unknown authored
      client code and replication slave code, as far as LOAD DATA INFILE and
      other queries' execution is concerned. Duplication of code leads to
      replication bugs, because the replication duplicate lags much behind.
      Fix for 2 Valgrind errors on slave replicating LOAD DATA INFILE
        - one serious (causing a random test failure in rpl_loaddata in 5.0)
        - one not serious (theoretically a bug but not dangerous): uninited thd->row_count
      
      
      sql/log_event.cc:
        Fix for 2 Valgrind errors:
        - one serious (causing a random test failure in rpl_loaddata in 5.0): uninited lex in replic of LOAD DATA INFILE on slave
        - one not serious (theoretically a bug but not dangerous): uninited thd->row_count in replication of LOAD DATA INFILE on slave.
        Sanja is likely to rework the fix to the 1st problem tomorrow.
      e671c80b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0/ · a4316db7
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      a4316db7
    • unknown's avatar
      misc fixes for compile-time errors · e3071fff
      unknown authored
      
      sql/item_sum.cc:
        "unused variable" warning
      sql/item_timefunc.cc:
        "unused variable" warning
      sql/log_event.h:
        const bool is_valid() -> bool is_valid() const
      sql/opt_range.cc:
        cast log's argument to double (otherwise an error on some compilers)
      sql/opt_range.h:
        get_quick_select_for_ref should be declared in the global scope to be visible.
      e3071fff
    • unknown's avatar
      test of SHOW PRIVILEGES · 61a5a609
      unknown authored
      61a5a609
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · c627dbf7
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      c627dbf7
    • unknown's avatar
      Updates for archive storage engine. · 0aba089a
      unknown authored
      
      sql/examples/ha_archive.cc:
        Corrections from Bar's comments. Mainly small code changes/style changes.
      0aba089a
    • unknown's avatar
      sql_show.cc: · 901c635e
      unknown authored
        Add views privileges to SHOW PRIVILEGES output.
        (Bug #4656)
      
      
      sql/sql_show.cc:
        Add views privileges to SHOW PRIVILEGES output.
        (Bug #4656)
      901c635e
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · a7b4a508
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      a7b4a508
    • unknown's avatar
      Merge tsmith@build.mysql.com:/home/bk/mysql-4.1 · e369da32
      unknown authored
      into sand.box:/home/tim/m/41/bk
      
      
      mysql-test/r/ps_1general.result:
        Auto merged
      e369da32
    • unknown's avatar
      Get ps_1general test to pass (replace .result with .reject - some text · d8a34c9e
      unknown authored
      was changed in the SHOW STORAGE ENGINES results)
      
      
      mysql-test/r/ps_1general.result:
        SHOW STORAGE ENGINES now has different text ("type" -> "engine", etc.)
      d8a34c9e
    • unknown's avatar
      fixed quoting of identifiers in VIEWs (BUG#4613) · 0c1fabe8
      unknown authored
      
      mysql-test/r/view.result:
        fixed quoting of identifiers in VIEWs
      mysql-test/t/view.test:
        fixed quoting of identifiers in VIEWs
      sql/item.cc:
        fixed quoting of identifiers in VIEWs
      sql/sql_select.cc:
        fixed quoting of identifiers in VIEWs
      sql/sql_view.cc:
        fixed quoting of identifiers in VIEWs
      0c1fabe8
    • unknown's avatar
      results updated · e462d910
      unknown authored
      e462d910
    • unknown's avatar
      manual merge · 4118ce3f
      unknown authored
      
      client/mysql.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      include/my_global.h:
        Auto merged
      innobase/include/row0mysql.h:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/system_mysql_db.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      4118ce3f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 6979cda6
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      6979cda6
    • unknown's avatar
      oops, forgot to checkin... · 876c780f
      unknown authored
      876c780f
    • unknown's avatar
      results fixed after merge · 96ef39eb
      unknown authored
      
      mysql-test/t/create_select_tmp.test:
        --disable_warnings
      mysql-test/t/rpl_drop.test:
        --disable_warnings
      96ef39eb