1. 01 Apr, 2008 1 commit
  2. 31 Mar, 2008 1 commit
    • unknown's avatar
      Fix for · 00412389
      unknown authored
         Bug#35335 funcs_1: Some tests fail within load_file during
                            pushbuild runs
         Solution: 1. Move files with input data used in load_file, 
                      load data etc. 
                      from suite/funcs_1/<whatever>
                      to std_data
                   2. Use for testsuite funcs_1 the server option
                      --secure-file-priv=<MYSQLTEST_VARDIR>
                   3. Outfiles have to be stored under MYSQLTEST_VARDIR 
      + changes according to WL#4304 Cleanup in funcs_1 tests
        - backport of fixes/improvements made in 5.1 to 5.0
          The differences between scripts in 5.0 and 5.1 cause
          much additional and annoying work during any upmerge.
        - replace error numbers with names
        - improved comments
        - improved formatting
        - Unify storage engine names so that result files for
          storage engine variants do not differ (some tests)
        - remove a script no more used (tests are done in other scripts)
      
      
      BitKeeper/deleted/.del-triggers_master.test:
        Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
      mysql-test/std_data/funcs_1/innodb_tb1.txt:
        Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt
      mysql-test/std_data/funcs_1/innodb_tb2.txt:
        Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt
      mysql-test/std_data/funcs_1/innodb_tb3.txt:
        Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt
      mysql-test/std_data/funcs_1/innodb_tb4.txt:
        Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt
      mysql-test/std_data/funcs_1/memory_tb1.txt:
        Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt
      mysql-test/std_data/funcs_1/memory_tb2.txt:
        Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt
      mysql-test/std_data/funcs_1/memory_tb3.txt:
        Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt
      mysql-test/std_data/funcs_1/memory_tb4.txt:
        Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt
      mysql-test/std_data/funcs_1/myisam_tb1.txt:
        Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt
      mysql-test/std_data/funcs_1/myisam_tb2.txt:
        Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt
      mysql-test/std_data/funcs_1/myisam_tb3.txt:
        Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt
      mysql-test/std_data/funcs_1/myisam_tb4.txt:
        Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt
      mysql-test/std_data/funcs_1/t3.txt:
        Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt
      mysql-test/std_data/funcs_1/t4.txt:
        Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt
      mysql-test/std_data/funcs_1/t7.txt:
        Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt
      mysql-test/std_data/funcs_1/t9.txt:
        Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt
      mysql-test/Makefile.am:
        Introduce installation of funcs_1 files in std_data.
      mysql-test/mysql-test-run.pl:
        The tests within funcs_1 need a server started with
            --secure-file-priv=<MYSQLTEST_VARDIR>
        like the main regression tests.
      mysql-test/suite/funcs_1/README.txt:
        Extended description
      mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
        Cleanup
      mysql-test/suite/funcs_1/datadict/datadict_load.inc:
        Cleanup
      mysql-test/suite/funcs_1/include/innodb_tb1.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/innodb_tb2.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/innodb_tb3.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/innodb_tb4.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/memory_tb1.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/memory_tb2.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/memory_tb3.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/memory_tb4.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/myisam_tb1.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/myisam_tb2.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/myisam_tb3.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/myisam_tb4.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/include/sp_tb.inc:
        Adjustment to new storage place of infile.
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_09.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_memory.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_myisam.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_ndb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_innodb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_memory.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_myisam.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_0407.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_09.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_09.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated results
      mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
        "--echo" instead of SQL command.
      mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
        Adjustment to new storage place of infile
        + correct formatting.
      mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
        Backport from 5.1 + correct formatting.
      mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
        Minor improvements + correct formatting.
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Backport from 5.1 + correct formatting
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Backport from 5.1. + correct formatting
      mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
        Cleanup
      mysql-test/suite/funcs_1/t/is_basics_mixed.test:
        Adjustment to new storage place of outfile.
      mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
        Cleanup
      mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
        Cleanup
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Cleanup
      mysql-test/suite/funcs_1/triggers/triggers_03.inc:
        Backport from 5.1
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
        Backport from 5.1
      mysql-test/suite/funcs_1/triggers/triggers_08.inc:
        Backport from 5.1
      mysql-test/suite/funcs_1/triggers/triggers_09.inc:
        Backport from 5.1
      mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
        Backport from 5.1
      mysql-test/suite/funcs_1/views/func_view.inc:
        Backport from 5.1
      mysql-test/suite/funcs_1/views/views_master.inc:
        Cleanup
      mysql-test/std_data/funcs_1/load_file.txt:
        New BitKeeper file ``mysql-test/std_data/funcs_1/load_file.txt''
      00412389
  3. 27 Mar, 2008 8 commits
  4. 26 Mar, 2008 6 commits
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt-35193 · c3f2e303
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      c3f2e303
    • unknown's avatar
      Fixed bug #35193. · 0b8342ba
      unknown authored
      View definition as SELECT ... FROM DUAL WHERE ... has
      valid syntax, but use of such view in SELECT or
      SHOW CREATE VIEW syntax causes unexpected syntax error.
      
      Server omits FROM DUAL clause when storing view body
      string in a .frm file for further evaluation.
      However, syntax of SELECT-witout-FROM query is more
      restrictive than SELECT FROM DUAL syntax, and doesn't
      allow the WHERE clause.
      
      NOTE: this syntax difference is not documented.
      
      
      View registration procedure has been modified to
      preserve original structure of view's body.
      
      
      
      mysql-test/r/view.result:
        Added test case for bug #35193.
      mysql-test/t/view.test:
        Added test case for bug #35193.
      sql/sql_select.cc:
        Fixed bug #35193.
        The st_select_lex::print function always omits FROM DUAL clause,
        even if original SELECT query has the WHERE clause.
        
        The mysql_register_view function uses this function to reconstruct
        a body of view's AS clause for further evaluation and stores that
        reconstructed clause in a .frm file.
        
        SELECT without FROM syntax is more restrictive than 
        SELECT FROM DUAL syntax: second one allows
        the WHERE clause, but first one is not.
        
        Use of this view in SELECT or SHOW CREATE VIEW queries
        causes unexpected syntax errors.
        
        
        The st_select_lex::print function has been modified to
        reconstruct FROM DUAL clause in queries when needed.
        
        
        TODO: Syntax difference is not documented and should be
        eliminated, however improvement of
        the SELECT-without-FROM syntax is not trivial and leads to
        significant modification of grammar file because of additional
        shift/reduce conflicts.
      0b8342ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build · c932049c
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
      
      
      c932049c
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-amain · 4eaa7303
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      
      4eaa7303
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-ateam · 7587a871
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      
      7587a871
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-amain · 0d6f9bad
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      
      mysql-test/r/ctype_big5.result:
        Auto merged
      mysql-test/r/ctype_cp932.result:
        Auto merged
      mysql-test/r/ctype_euckr.result:
        Auto merged
      mysql-test/r/ctype_gb2312.result:
        Auto merged
      mysql-test/r/ctype_gbk.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/slave.cc:
        Auto merged
      0d6f9bad
  5. 25 Mar, 2008 5 commits
    • unknown's avatar
      Bug#20906 (Multiple assignments in SET in stored routine produce incorrect · 18801aa8
      unknown authored
      instructions)
      
      This bug can not be reproduced in the current version,
      adding the test case to the test suite for coverage, no code change.
      
      
      mysql-test/r/sp-code.result:
        Bug#20906 (Multiple assignments in SET in stored routine produce incorrect
        instructions)
      mysql-test/t/sp-code.test:
        Bug#20906 (Multiple assignments in SET in stored routine produce incorrect
        instructions)
      18801aa8
    • unknown's avatar
      information_schema.test, information_schema.result: · d62c9e33
      unknown authored
        Minor test case cleanup after bug#34529.
      
      
      mysql-test/r/information_schema.result:
        Minor test case cleanup after bug#34529.
      mysql-test/t/information_schema.test:
        Minor test case cleanup after bug#34529.
      d62c9e33
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · d6fc09af
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      d6fc09af
    • unknown's avatar
      Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0 · 4816e7b7
      unknown authored
      into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
      
      
      sql/sql_delete.cc:
        Auto merged
      4816e7b7
    • unknown's avatar
      BUG#35509 - Federated leaks memory when connecting to · 5ad505dd
      unknown authored
                  localhost/default port
      
      When creating federated table that points to unspecified host or
      localhost on unspecified port or port is 0, small memory leak occurs.
      
      This happens because we make a copy of unix socket path, which is
      never freed.
      
      With this fix we do not make a copy of unix socket path, instead
      share->socket points to MYSQL_UNIX_ADDR constant directly.
      
      This fix is covered by a test case for BUG34788.
      
      Affects 5.0 only.
      
      
      mysql-test/t/federated.test:
        A test case for BUG#35509.
      sql/ha_federated.cc:
        When creating federated table we call parse_url() to check if connect
        string is correct. parse_url() may make a copy of unix socket path if
        port is not specified or 0 and host is not specified or 'localhost'.
        This copy is never freed.
        
        As there is no need to make a copy of unix socket path, let
        share->socket point to MYSQL_UNIX_ADDR directly.
      5ad505dd
  6. 24 Mar, 2008 1 commit
  7. 23 Mar, 2008 1 commit
  8. 22 Mar, 2008 2 commits
  9. 21 Mar, 2008 2 commits
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a3558b5f
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
      
      
      a3558b5f
    • unknown's avatar
      Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) · cebb6727
      unknown authored
      The bool data type was redefined to BOOL (4 bytes on windows).
      Removed the #define and fixed some of the warnings that were uncovered
      by this.
      Note that the fix also disables 2 warnings :
      4800 : 'type' : forcing value to bool 'true' or 'false' (performance warning)
      4805: 'operation' : unsafe mix of type 'type' and type 'type' in operation
      
      These warnings will be handled in a separate bug, as they are performance related or bogus.
      
      Fixed to int the return type of functions that return more than 
      2 distinct values.
      
      
      CMakeLists.txt:
        Bug #26461: disable the C4800 and C4805 warnings temporarily
      include/config-win.h:
        Bug #26461: 
         - no need for this define for Windows.
         - windows C++ compilers have a bool type
      include/my_global.h:
        Bug #26461: removed bool_defined (no longer needed)
      sql/handler.h:
        Bug #26461: bool functions must return boolean values
      sql/mysql_priv.h:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/procedure.h:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_acl.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_acl.h:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_analyse.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_analyse.h:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_base.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_db.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_delete.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_load.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_parse.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_prepare.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      sql/sql_update.cc:
        Bug #26461: fixed return type of functions that return more than
        2 distinct values.
      cebb6727
  10. 20 Mar, 2008 3 commits
    • unknown's avatar
      BUG#34788 - malformed federated connection url is not handled · 8030bdfc
      unknown authored
                  correctly - crashes server !
      
      Creating federated table with connect string containing empty
      (zero-length) host name and port is evaluated as 0 (port is
      incorrect, omitted or 0) crashes server.
      
      This happens because federated calls strcmp() with NULL pointer.
      
      Fixed by avoiding strcmp() call if hostname is set to NULL.
      
      
      mysql-test/r/federated.result:
        A test case for BUG#34788.
      mysql-test/t/federated.test:
        A test case for BUG#34788.
      sql/ha_federated.cc:
        Fixed that parse_url() may call strcmp() with NULL pointer.
      8030bdfc
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-ateam · 0cb21ac2
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      
      0cb21ac2
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-4.1-axmrg · 4a0210bc
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      
      configure.in:
        Manual merge
      4a0210bc
  11. 19 Mar, 2008 10 commits