1. 09 Apr, 2008 1 commit
    • unknown's avatar
      Additional tests inspired by Bug · 9fd682e6
      unknown authored
         #12713 Error in a stored function called from a
                SELECT doesn't cause ROLLBACK of statem
      
      
      mysql-test/r/func_rollback.result:
        Expected results
      mysql-test/t/func_rollback.test:
        New test
      9fd682e6
  2. 04 Apr, 2008 4 commits
  3. 03 Apr, 2008 2 commits
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 · add10a48
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
      
      
      client/mysqlbinlog.cc:
        Auto merged
      include/my_time.h:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/init.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      add10a48
    • unknown's avatar
      Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 · 90112d11
      unknown authored
      When linking with some external programs, "multiple definition 
      of `init_time'"
      
      Rename init_time() to my_init_time() to avoid collision with other
      libraries (particularly libmng).
      
      
      client/mysqlbinlog.cc:
        Rename init_time() to my_init_time().
      include/my_time.h:
        Rename init_time() to my_init_time().
      sql-common/my_time.c:
        Rename init_time() to my_init_time().
      sql/init.cc:
        Rename init_time() to my_init_time().
      sql/tztime.cc:
        Rename init_time() to my_init_time().
      90112d11
  4. 02 Apr, 2008 2 commits
  5. 01 Apr, 2008 1 commit
    • unknown's avatar
      Post merge fix for · 93f2e395
      unknown authored
         ChangeSet@1.2583, 2008-03-31
         Merge five.local.lan:/work/merge/mysql-5.0-Bug
         into  five.local.lan:/work/merge/mysql-5.1-Bug
         Addditional manual fixes will be needed.
         MERGE: 1.1810.3667.16
      
         Which contains
            ChangeSet@1.1810.3667.16, 2008-03-31
            Fix for Bug
              #35335 funcs_1: Some tests fail within load_file during
                              pushbuild runs
         ...
      
      
      mysql-test/std_data/funcs_1/ndb_tb1.txt:
        Rename: mysql-test/suite/funcs_1/data/ndb_tb1.txt -> mysql-test/std_data/funcs_1/ndb_tb1.txt
      mysql-test/std_data/funcs_1/ndb_tb2.txt:
        Rename: mysql-test/suite/funcs_1/data/ndb_tb2.txt -> mysql-test/std_data/funcs_1/ndb_tb2.txt
      mysql-test/std_data/funcs_1/ndb_tb3.txt:
        Rename: mysql-test/suite/funcs_1/data/ndb_tb3.txt -> mysql-test/std_data/funcs_1/ndb_tb3.txt
      mysql-test/std_data/funcs_1/ndb_tb4.txt:
        Rename: mysql-test/suite/funcs_1/data/ndb_tb4.txt -> mysql-test/std_data/funcs_1/ndb_tb4.txt
      93f2e395
  6. 31 Mar, 2008 2 commits
    • unknown's avatar
      Merge five.local.lan:/work/merge/mysql-5.0-Bug · 2c4f9bd4
      unknown authored
      into  five.local.lan:/work/merge/mysql-5.1-Bug
      Addditional manual fixes will be needed.
      
      
      BitKeeper/deleted/.del-triggers_master.test:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t7.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t9.txt:
        Auto merged
      mysql-test/suite/funcs_1/README.txt:
        Auto merged
      mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_memory.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_myisam.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_views.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Auto merged
      mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
        Auto merged
      mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
        Auto merged
      mysql-test/suite/funcs_1/views/views_master.inc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        ul
        ul
      2c4f9bd4
    • 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
  7. 27 Mar, 2008 15 commits
    • unknown's avatar
      apply snapshot innodb-5.1-ss2387 · 1f21098a
      unknown authored
      ```---------------------------------------------------------------------
      r2361 | sunny | 2008-03-12 09:08:09 +0200 (Wed, 12 Mar 2008) | 3 lines
      Changed paths:
         M /branches/5.1/include/srv0srv.h
         M /branches/5.1/os/os0file.c
         M /branches/5.1/srv/srv0srv.c
         M /branches/5.1/srv/srv0start.c
      
      branches/5.1: Remove the innodb_flush_method fdatasync option since it was
      not being used and there was a potential it could mislead users.
      ```
      
      ---------------------------------------------------------------------
      r2367 | marko | 2008-03-17 10:23:03 +0200 (Mon, 17 Mar 2008) | 5 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
      
      branches/5.1: ha_innobase::check_if_incompatible_data(): Check
      HA_CREATE_USED_ROW_FORMAT before comparing row_type.  Previously,
      the comparison was incorrectly guarded by the presence of an
      AUTO_INCREMENT attribute.
      
      ------------------------------------------------------------------------
      r2374 | vasil | 2008-03-18 09:35:30 +0200 (Tue, 18 Mar 2008) | 11 lines
      Changed paths:
         M /branches/5.1/dict/dict0dict.c
         A /branches/5.1/mysql-test/innodb_bug35220.result
         A /branches/5.1/mysql-test/innodb_bug35220.test
      
      branches/5.1:
      
      Fix Bug#35220 ALTER TABLE too picky on reserved word "foreign".
      
      In ALTER TABLE, change the internal parser to search for
      ``FOREIGN[[:space:]]'' instead of only ``FOREIGN'' when parsing
      ALTER TABLE ... DROP FOREIGN KEY ...; otherwise it could be mistaken
      with ALTER TABLE ... DROP foreign_col;
      
      Approved by:    Heikki
      
      ------------------------------------------------------------------------
      r2379 | vasil | 2008-03-19 18:48:00 +0200 (Wed, 19 Mar 2008) | 10 lines
      Changed paths:
         M /branches/5.1/os/os0file.c
      
      branches/5.1:
      
      Fix Bug#34823:
      fsync() occasionally returns ENOLCK and causes InnoDB to restart mysqld
      
      Create a wrapper to fsync(2) that retries the operation if the error is
      ENOLCK. Use that wrapper instead of fsync(2).
      
      Approved by:    Heikki
      
      ------------------------------------------------------------------------
      r2380 | sunny | 2008-03-21 05:03:56 +0200 (Fri, 21 Mar 2008) | 9 lines
      Changed paths:
         M /branches/5.1/include/trx0undo.h
         M /branches/5.1/trx/trx0trx.c
         M /branches/5.1/trx/trx0undo.c
      
      branches/5.1: Fix for Bug# 35352. We've added a heuristic that checks
      the size of the UNDO slots cache lists (insert and upate). If either of
      cached lists has more than 500 entries then we add any UNDO slots that are
      freed, to the common free list instead of the cache list, this is to avoid
      the case where all the free slots end up in only one of the lists on startup
      after a crash.
      
      Tested with test case for 26590 and passes all mysql-test(s).
      
      ------------------------------------------------------------------------
      r2383 | vasil | 2008-03-26 09:35:22 +0200 (Wed, 26 Mar 2008) | 4 lines
      Changed paths:
         M /branches/5.1/include/row0mysql.h
      
      branches/5.1:
      
      Fix typo in comment.
      
      ------------------------------------------------------------------------
      r2384 | vasil | 2008-03-26 18:26:54 +0200 (Wed, 26 Mar 2008) | 20 lines
      Changed paths:
         A /branches/5.1/mysql-test/innodb_bug34300.result
         A /branches/5.1/mysql-test/innodb_bug34300.test
         M /branches/5.1/row/row0sel.c
      
      branches/5.1:
      
      Fix Bug#34300 Tinyblob & tinytext fields currupted after export/import and alter in 5.1
      
      Copy the BLOB fields, that are stored internally, to a safe place
      (prebuilt->blob_heap) when converting a row from InnoDB format to
      MySQL format in row_sel_store_mysql_rec().
      
      The bug was introduced in:
      
       ------------------------------------------------------------------------
       r587 | osku | 2006-05-23 15:35:58 +0300 (Tue, 23 May 2006) | 3 lines
      
       Optimize BLOB selects by using prebuilt->blob_heap directly instead of first
       reading BLOB data to a temporary heap and then copying it to
       prebuilt->blob_heap.
       ------------------------------------------------------------------------
      
      Approved by:    Heikki
      
      ------------------------------------------------------------------------
      r2386 | vasil | 2008-03-27 07:45:02 +0200 (Thu, 27 Mar 2008) | 22 lines
      Changed paths:
         M /branches/5.1/mysql-test/innodb.result
      
      branches/5.1:
      
      Merge change from MySQL (this fixes the failing innodb test):
      
      ChangeSet@1.1810.3601.4, 2008-02-07 02:33:21+04:00, gshchepa@host.loc +9 -0
        Fixed bug#30059.
        Server handles truncation for assignment of too-long values
        into CHAR/VARCHAR/TEXT columns in a different ways when the
        truncated characters are spaces:
        1. CHAR(N) columns silently ignore end-space truncation;
        2. TEXT columns post a truncation warning/error in the
           non-strict/strict mode.
        3. VARCHAR columns always post a truncation note in
           any mode.
      
        Space truncation processing has been synchronised over
        CHAR/VARCHAR/TEXT columns: current behavior of VARCHAR
        columns has been propagated as standard.
      
        Binary-encoded string/BLOB columns are not affected.
      
      
      ------------------------------------------------------------------------
      r2387 | vasil | 2008-03-27 08:49:05 +0200 (Thu, 27 Mar 2008) | 8 lines
      Changed paths:
         M /branches/5.1/row/row0sel.c
      
      branches/5.1:
      
      Check whether *trx->mysql_query_str is != NULL in addition to
      trx->mysql_query_str. This adds more safety.
      
      This may or may not fix Bug#35226 RBR event crashes slave.
      
      
      ------------------------------------------------------------------------
      
      
      storage/innobase/dict/dict0dict.c:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/handler/ha_innodb.cc:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/include/row0mysql.h:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/include/srv0srv.h:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/include/trx0undo.h:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/os/os0file.c:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/row/row0sel.c:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/srv/srv0srv.c:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/srv/srv0start.c:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/trx/trx0trx.c:
        apply snapshot innodb-5.1-ss2387
      storage/innobase/trx/trx0undo.c:
        apply snapshot innodb-5.1-ss2387
      1f21098a
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 099c8889
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      099c8889
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 0c2b6330
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      0c2b6330
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 0db1f520
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      0db1f520
    • unknown's avatar
      Merge trift2.:/MySQL/M51/ndb-decl-5.1 · a0cf1fa1
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      a0cf1fa1
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 648dae60
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      648dae60
    • unknown's avatar
      BUG#25340 · 5a6b357e
      unknown authored
      5a6b357e
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 09d7b08a
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      09d7b08a
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 797a2d68
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      797a2d68
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 9878e861
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      configure.in:
        Auto merged
      9878e861
    • unknown's avatar
      Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50 · db9df4c7
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
      
      
      db9df4c7
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 42a06b46
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
      
      
      42a06b46
    • unknown's avatar
      Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51 · f676e122
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
      
      
      f676e122
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 45ebe995
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      mysql-test/r/drop.result:
        SCCS merged
      mysql-test/t/drop.test:
        SCCS merged
      45ebe995
    • unknown's avatar
      Apply innodb-5.1-ss2360 snapshot · 9aaab69a
      unknown authored
      Fixes:
      - Bug #34920: auto_increment resets to 1 on foreign key creation
        We need to use/inherit the passed in autoinc counter for ALTER TABLE
        statements too.
      
      
      mysql-test/r/innodb.result:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      mysql-test/t/innodb.test:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      storage/innobase/dict/dict0dict.c:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/handler/ha_innodb.cc:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
        
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      storage/innobase/handler/ha_innodb.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/dict0dict.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/dict0mem.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/row0sel.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/univ.i:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/row/row0sel.c:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      9aaab69a
  8. 26 Mar, 2008 13 commits
    • unknown's avatar
      Post-merge fix. · 321f392f
      unknown authored
      Query cache does now work with concurrent_insert=0. See
      Bug 33756 - query cache with concurrent_insert=0 appears broken
      
      
      321f392f
    • 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 bk-internal.mysql.com:/home/bk/mysql-5.1-build · 19afc9d9
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      
      19afc9d9
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build · faf1d55c
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      
      support-files/mysql.server.sh:
        Auto merged
      faf1d55c
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 0fe833f4
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      0fe833f4
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-amain · 98b77660
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      mysql-test/t/query_cache.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      mysql-test/r/query_cache.result:
        SCCS merged
      98b77660
    • 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
      Post-merge fix · 10d9d68d
      unknown authored
      10d9d68d
    • unknown's avatar
      Dummy change to force PushBuild. · 27c0540b
      unknown authored
      27c0540b
    • unknown's avatar
      Dummy change to force PushBuild. · c49632cf
      unknown authored
      c49632cf
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-ateam · cebc10e3
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        Manual merge
      mysql-test/suite/binlog/t/binlog_unsafe.test:
        Manual merge
      cebc10e3
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-axmrg · f77bca69
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      mysql-test/r/ctype_big5.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/suite/binlog/r/binlog_stm_ctype_cp932.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/slave.cc:
        Auto merged
      mysql-test/r/federated.result:
        Manual merge from 5.0
      mysql-test/t/federated.test:
        Manual merge from 5.0
      storage/federated/ha_federated.cc:
        Manual merge from 5.0
      f77bca69
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-amain · 03c110ea
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      mysql-test/r/ctype_big5.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/suite/binlog/r/binlog_row_ctype_cp932.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/rpl_rli.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        SCCS merged
      03c110ea