1. 19 Dec, 2006 1 commit
    • unknown's avatar
      Bug#25183 (Compiler warnings in the sql directory (GCC 4.1)) · 44ed4907
      unknown authored
      Fixed compiler warnings.
      
      In set_var.cc, the code was not properly returning an error code
      if close_cached_tables() failed.
      
      In sql_tables.cc, the code was not returning properly an error code
      if lock_table_names() failed.
      
      Both cases are bugs, introduced in 5.1 only by recent changes.
      
      
      sql/set_var.cc:
        Fixed build warnings:
        set_var.cc:3861: warning: 'result' may be used uninitialized in this function
      sql/sql_table.cc:
        Fixed build warnings:
        sql_table.cc:5307: warning: 'error' may be used uninitialized in this function
      44ed4907
  2. 12 Dec, 2006 7 commits
    • unknown's avatar
      Merge cleanup · 552d4ced
      unknown authored
      552d4ced
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime · d70fde4c
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge2
      
      
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/r/sp-vars.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Manual 
        Manual merge, partial
      d70fde4c
    • unknown's avatar
      Post-merge fixes. · f19d9b41
      unknown authored
      
      mysql-test/r/read_only.result:
        A post-merge fix: update results.
      server-tools/instance-manager/guardian.cc:
        Remove initialization of a non-existent member.
      f19d9b41
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · fabf58c6
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/log_tables.result:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/read_only.result:
        Manual merge.
      mysql-test/t/read_only.test:
        Manual merge.
      server-tools/instance-manager/guardian.cc:
        Manual merge.
      fabf58c6
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · a6f0b03e
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
      
      
      sql/sp_head.cc:
        Auto merged
      a6f0b03e
    • unknown's avatar
      minor cleanup · d501b2dd
      unknown authored
      
      mysql-test/t/sp_stress_case.test:
        Minor cleanup ... the test is now faster, even in debug builds
      d501b2dd
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 1ec10680
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-19194
      
      
      sql/sp_head.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      1ec10680
  3. 11 Dec, 2006 1 commit
    • unknown's avatar
      Bug#19194 (Right recursion in parser for CASE causes excessive stack usage, · c01c4cc3
      unknown authored
        limitation)
      Bug#24854 (Mixing Searched Case with Simple Case inside Stored Procedure
        crashes Mysqld)
      
      Implemented code review (19194) comments
      
      
      mysql-test/r/sp_stress_case.result:
        Implemented code review comments : use SQL instead of a shell script to
        generate the code
      mysql-test/t/sp_stress_case.test:
        Adjusted
      sql/sql_yacc.yy:
        Added more explicit comments
      BitKeeper/deleted/.del-sp_stress_case.sh:
        Delete: mysql-test/t/sp_stress_case.sh
      c01c4cc3
  4. 07 Dec, 2006 2 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · e54bbaa3
      unknown authored
      into  example.com:/work/mysql-5.1-maint
      
      
      e54bbaa3
    • unknown's avatar
      Additional fix for bug#22369 · 0a22a1b9
      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
      0a22a1b9
  5. 06 Dec, 2006 5 commits
  6. 05 Dec, 2006 24 commits