Added check which throws ER_WRONG_OBJECT error in case the .frm
doesn't contain a valid table type (e.g. view or trigger)

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
Note that test 'variables.test' fails.
This will be fixed when Jimw pushes the fix for Bug 10351

into  mysql.com:/home/my/mysql-5.0

allowed unintended overflows. (Bug #10351)

into  mysql.com:/home/my/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-28jul-look

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/my/mysql-5.0

Ensure mysql_close() is called if mysql_set_character_set() fails

  row_sel_store_mysql_rec(): Make comment about space padding
  more accurate.

correctly.

into mysql.com:/home/gluh/MySQL/Merge/5.0

into  mysql.com:/home/my/mysql-5.0

Bug #12112

(This is because conds may not be a constant)
This bug caused a failure in the test suite for select.test becasue for prepared statements in one case a 'constant sub query' was not regarded as a constant
Sanja will as a separate task check if we can fix that the sub query can be recognized as a constant
Bug #12217

  potential zlib security vulnerability (CAN-2005-1849). Fix was taken from the
  official zlib-1.2.3 distribution (no other zlib-1.2.3 changes were applied)

Fix for bug#12127 triggers do not show in info_schema before they are used if set to the database(2nd version)
  use db name of table which trigger belongs to
  instead of thd->db name during trigger body parsing

into  mysql.com:/home/my/mysql-5.0

(Originally:   1.1891 05/07/25 12:07:47 jimw@mysql.com )

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

Query has to be written to the log before calling
thd->set_statement(&stmt_backup), otherwise query will be empty.
Setting thd->enabe_slow_log to FALSE prevents that dispatch_command
logs the (empty) query again.

Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected

into  mysql.com:/home/my/mysql-4.1

into  mysql.com:/home/my/mysql-4.1

into  mysql.com:/usr/home/ram/work/mysql-5.0

Change argument order to be database, tablename for some functions

into deer.(none):/home/hf/work/mysql-5.0.clean