refs #5333 #5334 randomize field expansion tests

git-svn-id: file:///svn/mysql/tests/mysql-test@47709 c7de825b-a66e-492c-adef-691d508d4ae1

mysql-test/suite/tokudb.change_column/t/Makefile

@@ -7,3 +7,8 @@ default: $(T)
 
 %.test: %.py
 	python $< >$@
+
+change_all.test: change_all.py
+	python change_all.py --experiments=1000 --nrows=10 >change_all_1000_10.test
+	python change_all.py --experiments=1000 --nrows=1 >change_all_1000_1.test
+

mysql-test/suite/tokudb.change_column/t/change_all.py

 import sys
 import random
 import string
+import re
 
 class Field:
     def __init__(self, name, is_nullible):
@@ -134,7 +135,12 @@ class Field_blob(Field):
 def main():
     experiments = 1000
     nrows = 10
-    random.seed(0)
+    seed = 0
+    for arg in sys.argv[1:]:
+        match = re.match("--(.*)=(.*)", arg)
+        if match:
+            exec("%s = %s" % (match.group(1),match.group(2)))
+    random.seed(seed)
     header()
     for experiment in range(experiments):
         # generate a schema
@@ -145,32 +151,30 @@ def main():
 
         # insert some rows
         for r in range(nrows):
-            print insert_row(fields)
+            print insert_row(fields) % ('t')
         print "CREATE TABLE ti LIKE t;"
         print "ALTER TABLE ti ENGINE=myisam;"
         print "INSERT INTO ti SELECT * FROM t;"
 
-        # compare tables
-        print "let $diff_tables = test.t, test.ti;"
-        print "source include/diff_tables.inc;"
-
         # change fixed column
         next_field = fields[0].next_field('')
         print "ALTER TABLE t CHANGE COLUMN a a %s;" % (next_field.get_type())
         print "ALTER TABLE ti CHANGE COLUMN a a %s;" % (next_field.get_type())
         
         # add some more rows
-
-        # compare tables
-        print "let $diff_tables = test.t, test.ti;"
-        print "source include/diff_tables.inc;"
+        new_row = insert_row(fields)
+        print new_row % ('t')
+        print new_row % ('ti')
 
         # change variable column
         next_field = fields[3].next_field('')
         print "ALTER TABLE t CHANGE COLUMN d dd %s;" % (next_field.get_type())
         print "ALTER TABLE ti CHANGE COLUMN d dd %s;" % (next_field.get_type())        
 
-        # add some more rows
+        # add a row
+        new_row = insert_row(fields)
+        print new_row % ('t')
+        print new_row % ('ti')
 
         # compare tables
         print "let $diff_tables = test.t, test.ti;"
@@ -213,7 +217,7 @@ def create_table(fields):
     return t
 
 def insert_row(fields):
-    t = "INSERT INTO t VALUES ("
+    t = "INSERT INTO %s VALUES ("
     for i in range(len(fields)):
         f = fields[i]
         t += "%s" % (f.get_value())