1. 27 Feb, 2006 1 commit
  2. 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
  3. 24 Feb, 2006 5 commits
    • 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
  4. 23 Feb, 2006 9 commits
    • 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
      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
  5. 22 Feb, 2006 4 commits
    • unknown's avatar
      Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 · 2a88d0f4
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug17265
      
      
      2a88d0f4
    • unknown's avatar
      BUG#17265 Assertion failure in rpl_row_view01. · 0d3cf6b0
      unknown authored
      To quote Timour review lines:
      
      The actual cause of the bug is that sql_base.cc:setup_wild()
      sets "select_lex->with_wild = 0" (in the end of the function) once
      it expands all wild-cards, and wild-card expansion is done during
      the prepare phase. During this phase we replace all "*" with the
      corresponding items, which for views happen to be references to
      references. When we do execute, select_lex->with_wild = 0, and
      all "*" are already replaced by the corresponding items, which
      in the case of views need to be dereferenced first.
      
      Fixed by refining the assert. Regression test for the bug is rpl_row_view01,
      as was reported.
      
      
      sql/item.cc:
        Refined asssert, suggested by Evgen, due to BUG#17265 prepared statement for select with ps-protocol 
        does not hold the former.
      0d3cf6b0
    • unknown's avatar
      Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement. · 85e54a08
      unknown authored
      The problem was that error flag was not reset.
      
      
      mysql-test/r/sp-security.result:
        Results for test case for BUG#7787.
      mysql-test/t/sp-security.test:
        A test case for BUG#7787.
      sql/sp.cc:
        Reset errors after sp_find_routine().
      85e54a08
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f0cff0f6
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      f0cff0f6
  6. 21 Feb, 2006 15 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b56d453c
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      sql/sql_yacc.yy:
        Auto merged
      sql/share/errmsg.txt:
        SCCS merged
      b56d453c
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878 · 9eca5889
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql/sp_head.cc:
        Auto merged
      mysql-test/r/mysqldump.result:
        Merge
      mysql-test/t/mysqldump.test:
        Merge
      9eca5889
    • unknown's avatar
      Fixed bug#17530: Incorrect key truncation on table creation caused server crash. · 71ee8615
      unknown authored
      When a too long field is used for a key, only a prefix part of the field is 
      used. Length is reduced to the max key length allowed for storage. But if the
      field have a multibyte charset it is possible to break multibyte char
      sequence. This leads to the failed assertion in the innodb code and 
      server crash when a record is inserted.
      
      The make_prepare_table() now aligns truncated key length to the boundary of
      multibyte char.
      
      
      mysql-test/t/create.test:
        Added test case for bug#17530: Incorrect key truncation on table creation caused server crash.
      mysql-test/r/create.result:
        Added test case for bug#17530: Incorrect key truncation on table creation caused server crash.
      sql/sql_table.cc:
        Fixed bug#17530: Incorrect key truncation on table creation caused server crash.
        The make_prepare_table() now aligns truncated key length to the boundary of
        multibyte char.
      71ee8615
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871 · c9d8cb49
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      c9d8cb49
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 387ae4ab
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race
      
      
      server-tools/instance-manager/instance_map.cc:
        Auto merged
      387ae4ab
    • unknown's avatar
      Fix race condition: instance map wasn't locked for the · 21aa5867
      unknown authored
      duration of the whole 'flush instances'. As a consequence,
      it was possible to query instance map, while it is in the
      inconsistent state. The patch was reworked after review.
      
      
      server-tools/instance-manager/guardian.cc:
        do not lock instance map in Guardian_thread::init()
      server-tools/instance-manager/instance_map.cc:
        Eliminate race condition: lock instance map and guardian
        for the duration of the whole "FLUSH INSTANCES" execution.
      server-tools/instance-manager/instance_map.h:
        add new method. cleanup interface. add comments.
      server-tools/instance-manager/manager.cc:
        use instance_map.flush_instances instead of instance_map.load() and guardian_thread.init()
      21aa5867
    • unknown's avatar
      Bug#14857 Reading dump files with single statement stored routines fails.Bug... · 1f12107f
      unknown authored
      Bug#14857 Reading dump files with single statement stored routines fails.Bug #14857  	Reading dump files with single statement stored routines fails.
       - Add tests, fixed by patch for 16878
      
      
      mysql-test/r/mysqldump.result:
        Update test results
      mysql-test/t/mysqldump.test:
        Add tests for bug 14857
      1f12107f
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0a970b12
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
      
      
      0a970b12
    • unknown's avatar
      Fix for Bug #12674 "Instance Manager: IM doesn't handle client · 8a1dd17b
      unknown authored
      connections correctly".
      Recommit with the max timeout value in sync with the comment.
      
      
      server-tools/instance-manager/options.cc:
        add new option to set wait timeout
      server-tools/instance-manager/priv.h:
        add a const for max wait timeout
      8a1dd17b
    • unknown's avatar
      Bug#14871 mysqldump: invalid view dump output · 15c37025
      unknown authored
       - Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
      
      
      client/mysqldump.c:
        Use information_schema.views to gather information about the view, then replace some parts of the output from "SHOW CREATE VIEW" with comment markers with version, to make thos parts of the view syntax become parsed only of MySQL servers that supports it.
        Create common function "open_sql_file_for_table" to open the individual .sql file where to dump the table or view.
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/t/mysqldump.test:
        Add test to see that views can be deumped and reloaded alos when they contain "SECURITY TYPE", "CHECK OPTION" and "DEFINER"
      15c37025
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace · 3a9f0e76
      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
      client/mysqltest.c:
        Merge
      mysql-test/mysql-test-run.pl:
        Merge, undo removal
      mysql-test/t/mysqldump.test:
        Merge
      mysql-test/t/mysqltest.test:
        Merge
      3a9f0e76
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809 · 7e57cbec
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      7e57cbec
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557 · f04e21e1
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      f04e21e1
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795 · 8d93d925
      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/mysqltest.test:
        Auto merged
      8d93d925
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057 · e36762ea
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      libmysql/libmysql.c:
        Auto merged
      e36762ea