4 Commits

Author	SHA1	Message	Date
unknown	d278381ec8	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 ... into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0 client/mysql.cc: Auto merged heap/hp_delete.c: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged scripts/fill_func_tables.sh: Auto merged scripts/mysql_install_db.sh: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged mysql-test/r/grant2.result: Manual merge mysql-test/r/heap_btree.result: Manual merge mysql-test/r/mysql_client.result: Manual merge mysql-test/t/grant2.test: Manual merge mysql-test/t/heap_btree.test: Manual merge mysql-test/t/mysql_client.test: Manual merge	2006-08-09 22:23:41 -04:00
unknown	ec95bf782f	Bug #20103: Escaping with backslash does not work ... - make the client to respect the server-side no_backslash_escapes option and disable the special meaning of backslash also at client side. mysql-test/r/mysql_client.result: Bug #20103: Escaping with backslash does not work - test case mysql-test/t/mysql_client.test: Bug #20103: Escaping with backslash does not work - test case	2006-08-01 11:05:54 +03:00
unknown	f794dc3aa1	Manual merge required. ... mysql-test/r/mysql_client.result: manual merge mysql-test/t/mysql_client.test: manual merge	2006-07-19 17:39:53 -04:00
unknown	7621597785	Bug#20432: mysql client interprets commands in comments ... do not look for client-specific commands while inside a multi-line comment. we will allow multi-comments pretty much anywhere within SQL-statements, but client-specific commands (help, use, print, ...) must be the first token in the input. client/mysql.cc: Bug#20432: mysql client interprets commands in comments mysql-test/r/mysql_client.result: Bug#20432: mysql client interprets commands in comments test client-side parsing of comments and client-specific commands mysql-test/t/mysql_client.test: Bug#20432: mysql client interprets commands in comments test client-side parsing of comments and client-specific commands	2006-07-13 09:04:06 +02:00