1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-18 23:03:28 +03:00
Commit Graph

9 Commits

Author SHA1 Message Date
2d7b51922a Fix for the latest instability found within funcs_1: ndb_views
Bug#31237 Test "ndb_views" fails because of differing order of select results


mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated results
mysql-test/suite/funcs_1/views/views_master.inc:
  Mangle the row numbers
2008-05-05 19:49:17 +02:00
93f2e39529 Post merge fix for
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
2008-04-01 13:18:31 +02:00
7c2a6ceb8b Post merge fix for
ChangeSet@1.2565, 2008-03-11 20:20:49+01:00
     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.26

   ChangeSet@1.1810.3473.26, 2008-03-11 19:54:35+01:00
   Post fix for
   WL#4203 Reorganize and fix the data dictionary tests of
           testsuite funcs_1

The final fix of
Bug#34532 Some funcs_1 tests do not clean up at end of testing
   and some minor additional modifications are for
happens here


mysql-test/suite/funcs_1/r/innodb_trig_03e.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_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_bitdata.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_cursors.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated results
mysql-test/suite/funcs_1/t/innodb_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_bitdata.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_cursors.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_0102.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_09.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_views.test:
  Cleanup
2008-03-12 12:56:07 +01:00
68eb3c9421 WL#4084: Code changes due to enabled the disabled tests (including other improvements).
BitKeeper/etc/ignore:
  Added mysql-test/funcs_1.log to the ignore list
2008-01-08 13:56:01 +01:00
7a1b0b53f7 post merge fix for bug#32496. 2007-11-26 22:50:12 +01:00
55c353dae6 1. Fix for Bug#31237 Test "ndb_views" fails because of differing order of select results
2. Cleanup of test


mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated expected results
mysql-test/suite/funcs_1/views/views_master.inc:
  1. Fix for Bug#31237
     Typical changes:
        - Move LIMIT .... from CREATE VIEW statement to the SELECT checking the VIEW content
        - Partially refine the SELECT on the VIEW to get a reproducible result
  2. Cleanup of test
        - replace error numbers by names
        - remove comments and workarounds dedicated to now fixed bugs
        - minor fixes or improvements in comments
        - remove trailing spaces
2007-10-05 20:06:41 +02:00
4cfe994ebc Updated to result files for cluster tests for version 5.1.21
Updared to 'views' test - forcing sort order
Updateds included masked results as a result of bug 30322


mysql-test/suite/funcs_1/include/ndb_tb2.inc:
  Correction to test file creating an ndb table
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated resut file - forcing order by
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_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_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/views/views_master.inc:
  updated test file - forcing sort order
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Updated result file
2007-08-08 17:16:26 -07:00
f32d1e9b49 Updated funcs_1 files to 5.1.18 level
- validating current result files
 - updating with new features in information_schema / error messages
 - forced order by and removed time stamps
removed a_version files that are not needed (now that the suite is in the main tree
Note: datadict tests still fail as a result of bug 28181 (a regression introduced in 
      5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed


BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58:
  Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26:
  Delete: mysql-test/suite/funcs_1/r/a_version_check.result
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  corrections to fooce order by on queries, replace time stamps with strings and enable the
  testing of referential_constraints table
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/memory_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/ndb_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/t/disabled.def:
  Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Added code to test for error in case of a trigger name that is to long
mysql-test/suite/funcs_1/views/views_master.inc:
  Correction to remove wrong '--eror' meaningless tag that generated warnings
2007-05-02 17:30:23 -07:00
ee5eb8bbe1 copy from test-extra-5.1 to main tree
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.
2007-02-06 13:35:54 +01:00