← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/include/diff_tables.inc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/include/diff_tables.inc
55
55
--echo Comparing tables $diff_table_1 and $diff_table_2
56
56
disable_query_log;
57
57
 
58
 
--error 0,1
59
 
--remove_file $MYSQLTEST_VARDIR/tmp/diff_table_1
60
 
--error 0,1
61
 
--remove_file $MYSQLTEST_VARDIR/tmp/diff_table_2
 
58
--error EE_OK,EE_ERROR_FIRST
 
59
--remove_file $DRIZZLETEST_VARDIR/tmp/diff_table_1
 
60
--error EE_OK,EE_ERROR_FIRST
 
61
--remove_file $DRIZZLETEST_VARDIR/tmp/diff_table_2
62
62
 
63
63
let $_diff_table=$diff_table_2;
64
64
let $_diff_i=2;
102
102
  # Now that we have the comma-separated list of columns, we can write
103
103
  # the table to a file.
104
104
  eval SELECT * FROM $_diff_table ORDER BY 1 
105
 
              INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/diff_table_$_diff_i';
 
105
              INTO OUTFILE '$DRIZZLETEST_VARDIR/tmp/diff_table_$_diff_i';
106
106
 
107
107
  # Do the same for $diff_table_1.
108
108
  dec $_diff_i;
112
112
 
113
113
# ==== Compare the generated files ====
114
114
 
115
 
diff_files $MYSQLTEST_VARDIR/tmp/diff_table_1 $MYSQLTEST_VARDIR/tmp/diff_table_2;
 
115
diff_files $DRIZZLETEST_VARDIR/tmp/diff_table_1 $DRIZZLETEST_VARDIR/tmp/diff_table_2;
116
116
 
117
 
--remove_file $MYSQLTEST_VARDIR/tmp/diff_table_1
118
 
--remove_file $MYSQLTEST_VARDIR/tmp/diff_table_2
 
117
--remove_file $DRIZZLETEST_VARDIR/tmp/diff_table_1
 
118
--remove_file $DRIZZLETEST_VARDIR/tmp/diff_table_2
119
119
 
120
120
enable_query_log;