← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/protocol.cc

Committer: Monty Taylor
Date: 2008-07-08 17:07:44 UTC
mfrom: (92 drizzle)
mto: (80.3.5 drizzle-stew-remove-old_password) (77.6.1 glibclient-merge)
mto: This revision was merged to the branch mainline in revision 104.
Revision ID: monty@inaugust.com-20080708170744-pfm8ovsw1h1q0o8y

Merged from trunk.
Moved resolve_stack_dump to mysql-test.
Removed perl-sub cruft in mysql-test.

files removed:
mysql-test/include/have_udf.inc

mysql-test/include/rpl_udf.inc

mysql-test/mysql-test-run-shell.sh

mysql-test/r/have_udf_example.require

mysql-test/r/udf.result

mysql-test/r/udf_skip_grants.result

mysql-test/suite/rpl/r/rpl_udf.result

mysql-test/suite/rpl/t/rpl_udf-master.opt

mysql-test/suite/rpl/t/rpl_udf-slave.opt

mysql-test/suite/rpl/t/rpl_udf.test

mysql-test/t/udf-master.opt

mysql-test/t/udf.test

mysql-test/t/udf_skip_grants-master.opt

mysql-test/t/udf_skip_grants.test

files renamed:
mysql-test/install_test_db.sh => mysql-test/install_test_db.in

extra/resolve_stack_dump.c => mysql-test/resolve_stack_dump.c

files modified:
configure.ac

mysql-test/Makefile.am

mysql-test/mysql-test-run.pl

mysql-test/resolve-stack

sql/Makefile.am

sql/mysqld.cc

sql/protocol.cc

sql/sql_parse.cc

sql/sql_udf.cc

sql/table.cc

Show diffs side-by-side

added added

removed removed

sql/protocol.cc

321

321

322

322

if (net->vio == 0)

323

323

{

324

if (thd->bootstrap)

325

{

326

/* In bootstrap it's ok to print on stderr */

327

fprintf(stderr,"ERROR: %d %s\n",sql_errno,err);

328

}

329

324

DBUG_VOID_RETURN;

330

325

}

331

326

Older »