1. 23 Feb, 2006 13 commits
    • 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
  2. 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
  3. 21 Feb, 2006 16 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
      A fix and a test case for Bug#13134 "Length of VARCHAR() utf8 · 9cf3f255
      unknown authored
      column is increasing when table is recreated with PS/SP":
      make use of create_field::char_length more consistent in the code.
      Reinit create_field::length from create_field::char_length
      for every execution of a prepared statement (actually fixes the 
      bug).
      
      
      mysql-test/r/ps.result:
        Test results fixed (Bug#13134)
      mysql-test/t/ps.test:
        A test case for Bug#13134 "Length of VARCHAR() utf8 column is 
        increasing when table is recreated with PS/SP"
      sql/field.cc:
        Move initialization of create_field::char_length to the constructor
        of create_field.
      sql/field.h:
        Rename chars_length to char_length (to be consistent with
        how this term is used throughout the rest of the code).
      sql/sql_parse.cc:
        Initialize char_length in add_field_to_list. This function
        effectively works as another create_field constructor.
      sql/sql_table.cc:
        Reinit length from char_length for every field in 
        mysql_prepare_table. This is not needed if we're executing
        a statement for the first time, however, at subsequent executions
        length contains the number of bytes, not characters (as it's expected 
        to).
      9cf3f255
    • 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
      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
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845 · ccec6f3e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      ccec6f3e
  4. 20 Feb, 2006 7 commits