An error occurred fetching the project authors.
  1. 14 May, 2010 1 commit
    • Alexander Nozdrin's avatar
      Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect · 4333980a
      Alexander Nozdrin authored
      for ALTER TABLE, LOAD DATA).
      
      ROW_COUNT is now assigned according to the following rules:
      
        - In my_ok():
          - for DML statements: to the number of affected rows;
          - for DDL statements: to 0.
      
        - In my_eof(): to -1 to indicate that there was a result set.
      
          We derive this semantics from the JDBC specification, where int
          java.sql.Statement.getUpdateCount() is defined to (sic) "return the
          current result as an update count; if the result is a ResultSet
          object or there are no more results, -1 is returned".
      
        - In my_error(): to -1 to be compatible with the MySQL C API and
          MySQL ODBC driver.
      
        - For SIGNAL statements: to 0 per WL#2110 specification. Zero is used
          since that's the "default" value of ROW_COUNT in the diagnostics area.
      
      sql/protocol.cc:
        Fix a typo.
      sql/sql_class.h:
        - Introduce THD::get_row_count_func() / THD::set_row_count_func();
        - Remove the CF_HAS_ROW_COUNT define
      sql/sql_parse.cc:
        CF_HAS_ROW_COUNT was eliminated.
      4333980a
  2. 22 Mar, 2010 1 commit
  3. 31 Jan, 2009 1 commit
  4. 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
  5. 07 Mar, 2008 1 commit
    • unknown's avatar
      Post merge fixes after · 633cc34c
      unknown authored
      ChangeSet@1.2561, 2008-03-07 17:44:03+01:00, mleich@five.local.lan +132 -0
        Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
        into  five.local.lan:/work/merge/mysql-5.1-funcs_1
        MERGE: 1.1810.3473.24
      
      ChangeSet@1.1810.3473.24, 2008-03-07
        WL#4203 Reorganize and fix the data dictionary tests of
                testsuite funcs_1
      
        1. Adjustment of expected results to modified server properties
        2. Add some tests of information_schema views
        3. Minor corrections and improvements
      
      
      BitKeeper/deleted/.del-ndb__datadict.result:
        Delete: mysql-test/suite/funcs_1/r/ndb__datadict.result
      BitKeeper/deleted/.del-ndb__datadict.test:
        Delete: mysql-test/suite/funcs_1/t/ndb__datadict.test
      BitKeeper/deleted/.del-ndb__load.test:
        Delete: mysql-test/suite/funcs_1/t/ndb__load.test
      BitKeeper/deleted/.del-ndb__load.result:
        Delete: mysql-test/suite/funcs_1/r/ndb__load.result
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
        Make the results independend of amount of preceding tests.
      mysql-test/suite/funcs_1/datadict/processlist_val.inc:
        Correct the cleanup
      mysql-test/suite/funcs_1/r/charset_collation_1.result:
        Updated results
      mysql-test/suite/funcs_1/r/charset_collation_2.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_basics_mixed.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_character_sets.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_collations.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_column_privileges.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_is.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_mysql.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_key_column_usage.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_routines.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_schema_privileges.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_schemata.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_statistics.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_statistics_mysql.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_table_constraints.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_table_privileges.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_is.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_mysql.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_triggers.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_user_privileges.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_10.result:
        Updated results
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
        Updated results
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
        Updated results
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
        Updated results
      mysql-test/suite/funcs_1/r/processlist_val_ps.result:
        Updated results
      mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
        Set subtest checking a no more reserved keyword
        to comment.
      mysql-test/suite/funcs_1/t/disabled.def:
        ndb__datadict is dropped. The checks are done in
        other scripts.
      mysql-test/suite/funcs_1/t/is_routines.test:
        Correction of comment
      mysql-test/suite/funcs_1/t/is_triggers.test:
        Adjustment to changes in privilege system between
        MySQL 5.0 and 5.1.
      mysql-test/suite/funcs_1/t/is_views.test:
        Correction of comment.
      mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test:
        Correction of comment.
      mysql-test/suite/funcs_1/t/processlist_priv_ps.test:
        Correction of comment.
      mysql-test/suite/funcs_1/t/processlist_val_no_prot.test:
        Correction of comment.
      mysql-test/suite/funcs_1/t/processlist_val_ps.test:
        Correction of comment.
      mysql-test/suite/funcs_1/r/is_engines.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_archive.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_blackhole.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_csv.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_federated.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_innodb.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_memory.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_merge.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_myisam.result:
        Expected results
      mysql-test/suite/funcs_1/t/is_engines.test:
        Test of information_schema.engines
      mysql-test/suite/funcs_1/t/is_engines_archive.test:
        Test of information_schema.engines
            Variant for ARCHIVE
      mysql-test/suite/funcs_1/t/is_engines_blackhole.test:
        Test of information_schema.engines
            Variant for BLACKHOLE
      mysql-test/suite/funcs_1/t/is_engines_csv.test:
        Test of information_schema.engines
            Variant for CSV
      mysql-test/suite/funcs_1/t/is_engines_federated.test:
        Test of information_schema.engines
            Variant for FEDERATED
      mysql-test/suite/funcs_1/t/is_engines_innodb.test:
        Test of information_schema.engines
            Variant for InnoDB
      mysql-test/suite/funcs_1/t/is_engines_memory.test:
        Test of information_schema.engines
            Variant for MEMORY
      mysql-test/suite/funcs_1/t/is_engines_merge.test:
        Test of information_schema.engines
            Variant for MERGGE
      mysql-test/suite/funcs_1/t/is_engines_myisam.test:
        Test of information_schema.engines
            Variant for MyISAM
      mysql-test/suite/funcs_1/t/is_engines_ndb.test:
        Test of information_schema.engines
            Variant for NDB
      mysql-test/suite/funcs_1/t/is_events.test:
        Test for information_schema.events
      mysql-test/suite/funcs_1/r/is_engines_ndb.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_events.result:
        Expected results
      633cc34c
  6. 08 Jan, 2008 1 commit
  7. 07 Sep, 2007 1 commit
    • unknown's avatar
      Modifications to funcs_1 files for 5.1.22rc release including: · 5fb2bdd7
      unknown authored
       - Updated row help count information
       - Added missing 'order by' clauses (altrady fixed in build tree)
       - Fixed isses with ndb_storeproc06/10 tests (added use database)
       - Corrected use of wrong engine in ndb tests (already fixed in build tree)
       - Update to ndb__datadict to replect additional fields in I_S (already corrected in build tree)
      
      
      mysql-test/suite/funcs_1/include/ndb_tb2.inc:
        Correction of wrong engine used for ndb test
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Updated result file
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Updated result file
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Updated result file
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory_views.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb__datadict.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_cursors.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_func_view.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_storedproc_06.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_storedproc_10.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_03.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_08.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_09.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
        Updated result file
      mysql-test/suite/funcs_1/r/ndb_views.result:
        Updated result file
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Updated test file enforcing 'use database' after connect
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Updated test file enforcing 'use database' after connect
      mysql-test/suite/funcs_1/views/views_master.inc:
        Adding order by clauses in missing places
      5fb2bdd7
  8. 06 Feb, 2007 1 commit
    • unknown's avatar
      copy from test-extra-5.1 to main tree · ee5eb8bb
      unknown authored
      BitKeeper/etc/ignore:
        Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list
      mysql-test/suite/funcs_2/include/check_charset.inc:
        inserted newline at the end of file.
      mysql-test/suite/objects/include/drop_all.inc:
        inserted newline at the end of file.
      mysql-test/suite/partitions/include/partition_key_32col.inc:
        inserted newline at the end of file.
      mysql-test/suite/rpl/data/rpl_mixed.dat:
        inserted newline at the end of file.
      mysql-test/suite/rpl/include/rpl_mixed_check_event.inc:
        inserted newline at the end of file.
      mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
        inserted newline at the end of file.
      mysql-test/suite/rpl/include/rpl_mixed_check_user.inc:
        inserted newline at the end of file.
      mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
        inserted newline at the end of file.
      ee5eb8bb