1. 15 Dec, 2006 1 commit
    • unknown's avatar
      WL #3031 · 5a7fec97
      unknown authored
      Yet another test result that needed to be regenerated due to new error
      messages. This test only runs via ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row rpl_extraCol_innodb
      
      5a7fec97
  2. 14 Dec, 2006 1 commit
    • unknown's avatar
      BUG #25074 · 7c3f7cc4
      unknown authored
      mysql_upgrade test gives inconsitent results
      
      7c3f7cc4
  3. 13 Dec, 2006 3 commits
    • unknown's avatar
      WL# 3031 · 548a208c
      unknown authored
      Found that the results from select had to be fixed too.
      
      548a208c
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 8409d6b3
      unknown authored
      into  radha.local:/Users/patg/mysql-build/mysql-5.1-arch-clean
      
      
      mysql-test/r/federated_server.result:
        Auto merged
      mysql-test/t/federated_server.test:
        Auto merged
      8409d6b3
    • unknown's avatar
      WL #3031 · 908c3bcb
      unknown authored
      changed to test verbiage to test PB on 5.1 arch tree
      
      908c3bcb
  4. 12 Dec, 2006 2 commits
    • unknown's avatar
      WL #3031 · dc5fe800
      unknown authored
      Trying again (!) to commit the fix containing replace-result to fix the problem
      with hard-coded ports in the result file of the federated_server test.
      
      dc5fe800
    • unknown's avatar
      WL# 3031 · dc3dc74f
      unknown authored
      Added --replace-result to avoid hard-coding of port
      
      dc3dc74f
  5. 11 Dec, 2006 1 commit
    • unknown's avatar
      WL #3031 · ef76c69a
      unknown authored
      * New result files due to new error message/error numbers
      * Fixed system_mysql_db tests to work with servers table
      * Added UTF8 charset to table defs
      
      
      mysql-test/include/system_db_struct.inc:
        WL# 3031
        
        Added servers table to inc file used in system_mysql_db* tests
      mysql-test/lib/init_db.sql:
        WL# 3031
        
        Added UTF charset to table def
      mysql-test/r/mysql.result:
        WL# 3031
        
        New result files, new error messages shifted error #s up by two
      mysql-test/r/rpl_sp.result:
        WL# 3031
        
        New result files, new error messages shifted error #s up by two
      mysql-test/r/sp.result:
        WL# 3031
        
        New result files, new error messages shifted error #s up by two
      mysql-test/r/sp_gis.result:
        WL# 3031
        
        New result files, new error messages shifted error #s up by two
      mysql-test/r/system_mysql_db.result:
        WL #3031
        
        New system_mysql_db tests required adding servers table creation. Some more
        comments in these tests would have been nice to explain what they do ;)
      mysql-test/t/system_mysql_db_fix30020.test:
        WL #3031
        
        New system_mysql_db tests required adding servers table creation. Some more
        comments in these tests would have been nice to explain what they do ;)
      mysql-test/t/system_mysql_db_fix40123.test:
        WL #3031
        
        New system_mysql_db tests required adding servers table creation. Some more
        comments in these tests would have been nice to explain what they do ;)
      mysql-test/t/system_mysql_db_fix50030.test:
        WL #3031
        
        New system_mysql_db tests required adding servers table creation. Some more
        comments in these tests would have been nice to explain what they do ;)
      scripts/mysql_create_system_tables.sh:
        WL# 3031
        
        Added utf8 charset to table def
      scripts/mysql_fix_privilege_tables.sql:
        WL# 3031
        
        Added servers table to mysql_fix_privilege_tables
      ef76c69a
  6. 09 Dec, 2006 4 commits
    • unknown's avatar
      WL #3031 · e92b91c0
      unknown authored
      Change to test results, committing so I can clone to another box to complete merge.
      
      e92b91c0
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 442fc59b
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
      
      
      mysql-test/lib/init_db.sql:
        Auto merged
      mysql-test/r/1st.result:
        Auto merged
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/r/mysqlcheck.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/system_mysql_db.result:
        Auto merged
      scripts/mysql_create_system_tables.sh:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      mysql-test/r/sp.result:
        WL# 3031
        
        More fun with error codes. These error codes vary in the result files because new error codes have been added
      mysql-test/r/sp_gis.result:
        WL# 3031
        
        More fun with error codes. These error codes vary in the result files because new error codes have been added
      442fc59b
    • unknown's avatar
      WL# 3031 · 33a7041c
      unknown authored
      Post-commit issues fixed
      * Test results for other tests fixed due to added error #s
      * Memory allocation/free issues found with running with valgrind
      * Fix to mysql-test-run shell script to run federated_server test (installs
      mysql.servers table properly)
      
      
      mysql-test/r/1st.result:
        WL #3031
        
        New result for 1st test
      mysql-test/r/backup.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/connect.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/information_schema.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/mysql.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/mysqlcheck.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/ndb_dd_basic.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/ndb_dd_ddl.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/select.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/show_check.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/sp.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/sp_gis.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/sp_trans.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/system_mysql_db.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/type_timestamp.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/warnings.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      mysql-test/r/xml.result:
        WL #3031
        
        Error codes differ due to addition of error codes for federated server errors (2)
        so all test results with hard-coded error #s will be off by two. New results generated.
      scripts/mysql_create_system_tables.sh:
        WL #3031
        
        Fixed old mysql-test-run.sh script to work with new mysql.servers table as reported
        by Cisco
      sql/sql_yacc.yy:
        WL# 3031
        
        OPTIONS/options must be usable as table or column name.
      storage/federated/ha_federated.cc:
        WL# 3031
        
        * Fixed allocation and free issues (warnings found with --valgrind)
        * Fixed cast issues
        * Made sure port was set accordingly
      33a7041c
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 2e9fe836
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      client/mysql.cc:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      2e9fe836
  7. 07 Dec, 2006 2 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 6bcdfc44
      unknown authored
      into  example.com:/work/mysql-5.1-maint
      
      6bcdfc44
    • unknown's avatar
      Additional fix for bug#22369 · 2fbf1a2c
      unknown authored
      
      mysql-test/t/events_bugs.test:
        let events_bugs not fail because of timing
      sql/sql_table.cc:
        if the db or name has been changed ALTER_RENAME,
        then fix table_list
        Solution by having the second table added in the parser to the
        list of used tables, won't work because checking of rights of merge
        tables goes over table_list->next_local and checks the rights, so
        we will fail there.
      sql/sql_yacc.yy:
        fix name - prevents ddd from correct working
      2fbf1a2c
  8. 06 Dec, 2006 6 commits
  9. 05 Dec, 2006 20 commits