1. 27 Feb, 2006 8 commits
  2. 26 Feb, 2006 6 commits
  3. 25 Feb, 2006 6 commits
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.0 · 54e0c92d
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      54e0c92d
    • unknown's avatar
      Fixed compiler warnings from gcc 4.0.2: · f5f01b15
      unknown authored
      - Added empty constructors and virtual destructors to many classes and structs
      - Removed some usage of the offsetof() macro to instead use C++ class pointers
      
      
      configure.in:
        Added comment
      ndb/include/ndbapi/NdbDictionary.hpp:
        Fixed compiler warnings from gcc 4.0.2
      sql/field.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/handler.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/item.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/item_cmpfunc.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/log_event.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/mysql_priv.h:
        Fixed compiler warnings from gcc 4.0.2
        For find_table_in_list I fixed it to use proper C++ class pointers instead of C style pointers
      sql/opt_range.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/parse_file.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sp_rcontext.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/spatial.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_base.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_cache.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_class.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_parse.cc:
        Fixed compiler warnings from gcc 4.0.2
        (Not pretty, but seams to work...)
      sql/sql_select.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/sql_update.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/table.h:
        Fixed compiler warnings from gcc 4.0.2
      sql/tztime.cc:
        Fixed compiler warnings from gcc 4.0.2
      sql/tztime.h:
        Fixed compiler warnings from gcc 4.0.2
      f5f01b15
    • unknown's avatar
      635d5b73
    • unknown's avatar
      Fixed typo · 6436f923
      unknown authored
      
      sql/sql_db.cc:
        Move LINT_INIT() to correct place
      6436f923
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.0 · 8ec3fa3b
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      8ec3fa3b
    • unknown's avatar
      Fixed new introduced bug in binlog.test with --ps-protocol · 3093b5fe
      unknown authored
      
      mysql-test/t/binlog.test:
        Fixed --ps-protocol (Side effect from last patch)
      sql/sql_db.cc:
        Removed compiler warning
        Fixed memory loss on slave
      tests/mysql_client_test.c:
        Removed compiler warnings
      3093b5fe
  4. 24 Feb, 2006 6 commits
    • unknown's avatar
      Fix for bug #13525 "Rename table does not keep info of triggers". · f8386dfa
      unknown authored
      Let us transfer triggers associated with table when we rename it (but only if
      we are not changing database to which table belongs, in the latter case we will
      emit error).
      
      
      mysql-test/r/trigger.result:
        Added test for bug #13525 "Rename table does not keep info of triggers".
      mysql-test/t/trigger.test:
        Added test for bug #13525 "Rename table does not keep info of triggers".
      sql/sql_rename.cc:
        rename_tables():
          Now after renaming table's .FRM file and updating handler data we call
          Table_triggers_list::change_table_name() which is reponsible for
          updating .TRG and .TRN files.
      sql/sql_table.cc:
        mysql_alter_table():
          Now in case when ALTER should rename table we call
          Table_triggers_list::change_table_name() which is responsible
          for updating .TRG and .TRN files after renaming table.
      sql/sql_trigger.cc:
        Added Table_triggers_list::change_table_name() method and
        change_table_name_in_triggers()/trignames() methods responsible for updating
        .TRG and .TRN files for table during its renaming.
        
        Two small cleanups - removed versioning for .TRG files (since it was not working
        before anyway) and emphasized that type of lock specified in tables list is
        unimportant for DROP TABLE (since this statement uses name-locking).
      sql/sql_trigger.h:
        Table_triggers_list:
          Added on_table_names_list member to store pointers and lenghts of
          "ON table_name" parts in triggers' definitions to be able easily
          change them during RENAME TABLE.
          Added change_table_name() method and change_table_name_in_trignames/triggers()
          helper methods responsible for updating .TRG and .TRN files.
      sql/sql_yacc.yy:
        trigger_tail:
          To be able properly update triggers' definitions with new table names
          when renaming tables we need to know where in CREATE TRIGGER statement
          "ON db_name.table_name" part resides.
          Small cleanup - let us emphasize that for CREATE TRIGGER statement 
          lock type which is specified in table list is unimportant since
          name-locking is used.
      f8386dfa
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.0 · dab88b29
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      dab88b29
    • unknown's avatar
      Fixes to embedded server to be able to run tests with it · 0afb6ff6
      unknown authored
      (Needed for "list of pushes" web page and autopush)
      
      
      include/mysql.h:
        Fix to embedded server to be able to run tests on it
      libmysql/libmysql.c:
        Fix to embedded server to be able to run tests on it
      libmysqld/emb_qcache.cc:
        Fix to embedded server to be able to run tests on it
      libmysqld/embedded_priv.h:
        Fix to embedded server to be able to run tests on it
      libmysqld/lib_sql.cc:
        Fix to embedded server to be able to run tests on it
      libmysqld/libmysqld.c:
        Fix to embedded server to be able to run tests on it
      mysql-test/mysql-test-run.sh:
        Fix to embedded server to be able to run tests on it
      mysql-test/r/binlog.result:
        Updated test for embedded server
      mysql-test/r/ctype_cp932.result:
        Updated test for embedded server
      mysql-test/r/innodb.result:
        Updated test for embedded server
      mysql-test/r/mysqltest.result:
        Updated test for embedded server
      mysql-test/r/query_cache.result:
        Updated test for embedded server
      mysql-test/r/query_cache_notembedded.result:
        Updated test for embedded server
      mysql-test/r/sp-error.result:
        Updated test for embedded server
      mysql-test/r/sp.result:
        Updated test for embedded server
      mysql-test/r/subselect.result:
        Updated test for embedded server
      mysql-test/r/view.result:
        Updated test for embedded server
      mysql-test/r/view_grant.result:
        Updated test for embedded server
      mysql-test/t/backup.test:
        Updated test for embedded server
      mysql-test/t/binlog.test:
        Updated test for embedded server
      mysql-test/t/blackhole.test:
        Updated test for embedded server
      mysql-test/t/compress.test:
        Updated test for embedded server
      mysql-test/t/ctype_cp932.test:
        Updated test for embedded server
      mysql-test/t/delayed.test:
        Updated test for embedded server
      mysql-test/t/handler.test:
        Updated test for embedded server
      mysql-test/t/innodb.test:
        Updated test for embedded server
      mysql-test/t/mysql.test:
        Updated test for embedded server
      mysql-test/t/mysql_client_test.test:
        Updated test for embedded server
      mysql-test/t/mysqltest.test:
        Updated test for embedded server
      mysql-test/t/query_cache.test:
        Updated test for embedded server
      mysql-test/t/query_cache_notembedded.test:
        Updated test for embedded server
      mysql-test/t/read_only.test:
        Updated test for embedded server
      mysql-test/t/skip_grants.test:
        Updated test for embedded server
      mysql-test/t/sp-destruct.test:
        Updated test for embedded server
      mysql-test/t/sp-error.test:
        Updated test for embedded server
      mysql-test/t/sp-threads.test:
        Updated test for embedded server
      mysql-test/t/sp.test:
        Updated test for embedded server
      mysql-test/t/subselect.test:
        Updated test for embedded server
      mysql-test/t/temp_table.test:
        Updated test for embedded server
      mysql-test/t/view.test:
        Updated test for embedded server
      mysql-test/t/view_grant.test:
        Updated test for embedded server
      mysql-test/t/wait_timeout.test:
        Updated test for embedded server
      mysys/mf_dirname.c:
        Review fix: Don't access data outside of array
      mysys/my_bitmap.c:
        Remove compiler warnings
      scripts/mysql_fix_privilege_tables.sql:
        Add flush privileges to .sql script so that one doesn't have to reboot mysqld when one runs the mysql_fix_privilege_script
      sql-common/client.c:
        Updated test for embedded server
      sql/item.cc:
        Remove DBUG_PRINT statement that can cause crashes when running with --debug
      sql/mysqld.cc:
        Fix to embedded server to be able to run tests on it
      sql/protocol.cc:
        Fix to embedded server to be able to run tests on it
        (Trivial reconstruction of code)
      sql/protocol.h:
        Fix to embedded server to be able to run tests on it
      sql/sql_base.cc:
        Better comment
      sql/sql_class.cc:
        Fix to embedded server to be able to run tests on it
      sql/sql_class.h:
        Fix to embedded server to be able to run tests on it
      sql/sql_cursor.cc:
        Fix to embedded server to be able to run tests on it
      sql/sql_parse.cc:
        Fix to embedded server to be able to run tests on it
        Don't crash for disabled commands when using embedded server
      sql/sql_prepare.cc:
        Fix to embedded server to be able to run tests on it
      mysql-test/r/ctype_cp932_notembedded.result:
        New BitKeeper file ``mysql-test/r/ctype_cp932_notembedded.result''
      mysql-test/r/innodb_notembedded.result:
        New BitKeeper file ``mysql-test/r/innodb_notembedded.result''
      mysql-test/r/sp.result.orig:
        New BitKeeper file ``mysql-test/r/sp.result.orig''
      mysql-test/r/sp_notembedded.result:
        New BitKeeper file ``mysql-test/r/sp_notembedded.result''
      mysql-test/r/subselect_notembedded.result:
        New BitKeeper file ``mysql-test/r/subselect_notembedded.result''
      mysql-test/t/ctype_cp932_notembedded.test:
        New BitKeeper file ``mysql-test/t/ctype_cp932_notembedded.test''
      mysql-test/t/innodb_notembedded.test:
        New BitKeeper file ``mysql-test/t/innodb_notembedded.test''
      mysql-test/t/sp.test.orig:
        New BitKeeper file ``mysql-test/t/sp.test.orig''
      mysql-test/t/sp_notembedded.test:
        New BitKeeper file ``mysql-test/t/sp_notembedded.test''
      mysql-test/t/subselect_notembedded.test:
        New BitKeeper file ``mysql-test/t/subselect_notembedded.test''
      0afb6ff6
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6716fc05
      unknown authored
      into moonbone.local:/work/17530-bug-5.0-mysql
      
      
      6716fc05
    • unknown's avatar
      Fix mysqldump.test to work with non-standard --vardir. · f1a8a34c
      unknown authored
      (Backported from mysql-5.1-new)
      
      
      mysql-test/t/mysqldump.test:
        Fix mysqldump.test to work with non-standard --vardir.
      f1a8a34c
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · eb7f54a9
      unknown authored
      into moonbone.local:/work/17530-bug-5.0-mysql
      
      
      eb7f54a9
  5. 23 Feb, 2006 14 commits
    • unknown's avatar
      After-merge fixes (Bug#13134) · f2fd3c27
      unknown authored
      f2fd3c27
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e0b4e228
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      e0b4e228
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-13134 · 9519987c
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      mysql-test/t/heap.test:
        Auto merged
      mysql-test/r/heap.result:
        Manual merge (use local)
      mysql-test/r/ps.result:
        Manual merge (use local)
      mysql-test/t/ps.test:
        Manual merge.
      sql/field.cc:
        Manual merge.
      sql/field.h:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      9519987c
    • unknown's avatar
      Remove 'delayed' to make the test deterministic (already · ea9ea952
      unknown authored
      fixed in 5.0).
      A post-review fix (Bug#13134)
      
      
      mysql-test/r/heap.result:
        Remove 'delayed' to make the test deterministic.
      mysql-test/r/ps.result:
        Remove an unneeded drop table (test case for Bug#13134)
      mysql-test/t/heap.test:
        Remove 'delayed' to make the test deterministic.
      mysql-test/t/ps.test:
        A post-review fix (Bug#13134)
      ea9ea952
    • unknown's avatar
      mysqltest.c: · ef1316fa
      unknown authored
        Rearrange out of order options in option struct.
      
      
      client/mysqltest.c:
        Rearrange out of order options in option struct.
      ef1316fa
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 19ed1c4b
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      19ed1c4b
    • unknown's avatar
      mysqld.cc: · 5dd2f66e
      unknown authored
        Fix out of order entries in option struct.
      
      
      sql/mysqld.cc:
        Fix out of order entries in option struct.
      5dd2f66e
    • unknown's avatar
      Change snprintf to my_snprintf · 72622734
      unknown authored
      
      client/mysqldump.c:
        snprintf =>  my_snprintf
      72622734
    • unknown's avatar
      Cleanup. · 258ad72c
      unknown authored
      
      sql/sql_base.cc:
        Cleanup, remove a warning.
      sql/sql_select.h:
        Cleanup: remove a warning.
      258ad72c
    • unknown's avatar
      Aix52 build fix · 24c44a9b
      unknown authored
      
      client/mysqldump.c:
        Declare variable in start of function
      24c44a9b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f7295f24
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      f7295f24
    • unknown's avatar
      Merge fixup · 9b1aa7fa
      unknown authored
      
      client/mysqltest.c:
        Fix after merge, do_eval has three args
        Remove extre return in do_block
      9b1aa7fa
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace · 897f8eab
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Merge
      897f8eab
    • unknown's avatar
      Add new parameter to do_eval so that only unescaped variables in input string... · 44e286d2
      unknown authored
      Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched.
      
      
      client/mysqltest.c:
        Add new parameter to 'do_eval' that will add any escape chars found in the input string to the output string. 
        This is used in 'do_system' and in 'do_exec' where only unescaped variables
        will be expanded, rest of the string will be left untouched.
      mysql-test/r/mysqltest.result:
        Update test result
      mysql-test/t/mysqldump.test:
        Revert previous patch that added extra \\ in "exec" command
      mysql-test/t/mysqltest.test:
        Revert previous patch that added extra \\ in exec command
      44e286d2