Commit graph

9 commits

Author SHA1 Message Date
unknown
01a979e8b2 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
include/config-win.h:
  Manual merge between main 5.1 and 5.1 marvel.
mysql-test/r/change_user.result:
  Manual merge between main 5.1 and 5.1 marvel.
mysql-test/t/change_user.test:
  Manual merge between main 5.1 and 5.1 marvel.
sql/sql_plugin.cc:
  Manual merge between main 5.1 and 5.1 marvel.
2008-03-28 12:14:27 +02:00
unknown
842fd8ba5e Merge kaamos.(none):/data/src/opt/bug34650/my51
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/change_user.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/change_user.test:
  Auto merged
2008-03-19 12:18:16 +03:00
unknown
0ba100d303 Fix for bug #34650: Test suite without cluster fails on Mac OS X
Leopard.

The change_user test failed because results of some statements
depended on platform and server build flags.

subselect_notembedded failure was a result of a bad merge from 5.0.

Fixed the corresponding test cases.


mysql-test/r/change_user.result:
  Fixed the test case.
mysql-test/r/subselect.result:
  Fixed the test case.
mysql-test/r/subselect_notembedded.result:
  Fixed the test case.
mysql-test/t/change_user.test:
  Fixed the test case.
mysql-test/t/subselect.test:
  Fixed the test case.
mysql-test/t/subselect_notembedded.test:
  Fixed the test case.
2008-03-07 21:14:34 +03:00
unknown
abf0761539 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel


client/mysqltest.c:
  Auto merged
mysql-test/r/change_user.result:
  Auto merged
mysql-test/t/change_user.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
2008-03-07 11:25:47 +02:00
unknown
27498bbaba Fixed a test.
mysql-test/r/change_user.result:
  Replaced value in result file, it was dependend on architecture.
mysql-test/t/change_user.test:
  Replaced an architecture dependend value in test
sql/mysqld.cc:
  Can be made shorter and without ifdefs.
2008-02-20 16:59:03 +02:00
unknown
e40e60fe33 Additional patch for Bug#31222: com_% global status counters
behave randomly with mysql_change_user.

The test case had to be moved into not_embedded_server.test file,
because SHOW GLOBAL STATUS does not work properly in embedded
server (see bug 34517).


BitKeeper/deleted/.del-change_user-master.opt:
  Delete: mysql-test/t/change_user-master.opt
mysql-test/r/change_user.result:
  Move test case for Bug#31222 to not_embedded_server.test.
mysql-test/r/not_embedded_server.result:
  Move test case for Bug#31222 to not_embedded_server.test.
mysql-test/t/change_user.test:
  Move test case for Bug#31222 to not_embedded_server.test.
mysql-test/t/not_embedded_server.test:
  Move test case for Bug#31222 to not_embedded_server.test.
2008-02-13 13:00:24 +03:00
unknown
215625b143 Fix for Bug#31222: com_% global status counters
behave randomly with mysql_change_user.
  
The problem was that global status variables were not updated
in THD::check_user(), so thread statistics were lost after
COM_CHANGE_USER.
  
The fix is to update global status variables with the thread ones
before preparing the thread for new user.


mysql-test/r/change_user.result:
  Update result file.
mysql-test/t/change_user.test:
  Add a test case for Bug#31222: com_% global status counters
  behave randomly with mysql_change_user.
sql/sql_class.cc:
  Update global status variables when we're handling
  COM_CHANGE_USER for a thread.
2008-02-12 20:59:09 +03:00
unknown
e512572827 Bug#31608 missing mysqltest change_user command
Post merge fixes: close any open statement before
the change user command and fix test case output.


client/mysqltest.c:
  Close an open statement since it won't work after a change_user command.
mysql-test/r/change_user.result:
  Fixed test case output.
mysql-test/t/change_user.test:
  Fix test case output to return 1 or 0.
2007-10-17 16:43:30 -03:00
unknown
88e5aa69f7 Bug#31608 missing mysqltest change_user command
The problem is that currently there is no way to test the behavior
of the mysql_change_user() function using the mysqltest suite because
there is no internal command for it.

The solution is to introduce a change_user command that can be used
to test aspects of the MySQL client function mysql_change_user().


client/mysqltest.c:
  Add change_user command to mysqltest.
mysql-test/r/mysqltest.result:
  Add test case result for change_user command
mysql-test/t/mysqltest.test:
  Add test case for change_user command
mysql-test/r/change_user.result:
  Add new file with test case results for bugs 20023 and 31418.
mysql-test/t/change_user.test:
  Add new file with test cases for bugs 20023 and 31418.
2007-10-16 12:29:22 -03:00