summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* Add ifdefs to control when "#pragma implementation" should be usedunknown2005-05-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some more ifdefs for "#pragma interface" client/sql_string.cc: USE_PRAGMA_IMPLEMENTATION client/sql_string.h: USE_PRAGMA_INTERFACE include/my_global.h: Use pragma implementation for gcc pre version 3 mysys/raid.cc: USE_PRAGMA_IMPLEMENTATION sql/field.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_berkeley.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_blackhole.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_heap.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_innodb.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_isam.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_isammrg.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_myisam.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_myisammrg.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_ndbcluster.cc: USE_PRAGMA_IMPLEMENTATION sql/handler.cc: USE_PRAGMA_IMPLEMENTATION sql/hash_filo.cc: USE_PRAGMA_IMPLEMENTATION sql/item.cc: USE_PRAGMA_IMPLEMENTATION sql/item_cmpfunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_func.cc: USE_PRAGMA_IMPLEMENTATION sql/item_geofunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_strfunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_subselect.cc: USE_PRAGMA_IMPLEMENTATION sql/item_sum.cc: USE_PRAGMA_IMPLEMENTATION sql/item_timefunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_uniq.cc: USE_PRAGMA_IMPLEMENTATION sql/item_uniq.h: USE_PRAGMA_INTERFACE sql/log_event.cc: USE_PRAGMA_IMPLEMENTATION sql/log_event.h: USE_PRAGMA_INTERFACE sql/opt_range.cc: USE_PRAGMA_IMPLEMENTATION sql/procedure.cc: USE_PRAGMA_IMPLEMENTATION sql/protocol.cc: USE_PRAGMA_IMPLEMENTATION sql/protocol_cursor.cc: USE_PRAGMA_IMPLEMENTATION sql/set_var.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_analyse.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_analyse.h: USE_PRAGMA_INTERFACE sql/sql_class.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_crypt.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_crypt.h: USE_PRAGMA_IMPLEMENTATION sql/sql_list.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_map.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_map.h: USE_PRAGMA_INTERFACE sql/sql_olap.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_select.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_string.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_udf.cc: USE_PRAGMA_IMPLEMENTATION sql/tztime.cc: USE_PRAGMA_IMPLEMENTATION
* Resolve bugfix mergeunknown2005-05-181-46/+71
|\ | | | | | | | | | | | | | | | | client/mysqldump.c: Merge bug fix mysql-test/r/mysqldump.result: Update results mysql-test/t/mysqldump.test: Merge bug fix
| * Small optimization to bug fix, from Monty.unknown2005-05-181-4/+5
| | | | | | | | | | client/mysqldump.c: Optimize away a call to strend() by using return value of my_snprintf()
| * Fix crash in mysqldump -c triggered by tables with a large number of longunknown2005-05-081-43/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | field names. (Bug #10286) client/mysqldump.c: Use a DYNAMIC_STRING for the 'INSERT ...' pattern so we can handle an arbitrary number of fields. Also rename the internal cFlag to opt_complete_insert so it is clear what it does. mysql-test/t/mysqldump.test: Add regression test for 10286 mysql-test/r/mysqldump.result: Update results
* | Fix memory leakunknown2005-05-161-3/+4
| | | | | | | | | | | | | | client/mysql.cc: Remove usage of c_ptr_safe() as this causes a linkage problem when compiling MySQL without inline functions sql/sql_base.cc: Don't use c_ptr_safe() on this string as this causes a realloc and the String object (allocated by sql_yacc.yy) is never freed
* | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-161-2/+17
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| * | mysqltest.c:unknown2005-05-161-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings client/mysqltest.c: To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
| * | mysqltest.c:unknown2005-05-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To solve bug#6193, also reset require when using 'eval' for running query mysql-test-run.pl: In cleanup, remove possible soft link to var directory mysql-test/mysql-test-run.pl: In cleanup, remove possible soft link to var directory client/mysqltest.c: To solve bug#6193, also reset require when using 'eval' for running query
| * | mysqltest.c, mysql-test-run.sh:unknown2005-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not to conflict with Windows return code 2 for "not found", use 62 for "skip" mysql-test-run.sh, suppress.purify: Use Purify suppress file mysql-test/suppress.purify: Purify suppress file mysql-test/mysql-test-run.sh: Use Purify suppress file Not to conflict with Windows return code 2 for "not found", use 62 for "skip" client/mysqltest.c: Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
* | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-082-8/+13
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
| * | Patch for --insert-ignoreunknown2005-05-072-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/client_priv.h: Additional option for insert-ignore client/mysqldump.c: Additional insert-ignore, change of delayed variable to insert_option mysql-test/r/mysqldump.result: Test results for --ignore-insert option. mysql-test/t/mysqldump.test: New additions to the test.
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-9186unknown2005-05-071-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean client/mysql.cc: Auto merged
| * | Change mysql prompt while inside a multiline comment. (Bug #9186)unknown2005-03-151-1/+2
| | | | | | | | | | | | | | | client/mysql.cc: Change prompt to "/*> " when inside a multiline comment.
* | | Bug #10245 VC++ compiler error with mysql.cc unknown2005-05-051-0/+6
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | Only print the read line version if we are on a platform that supports readline mysql.cc: Add #ifdef to only print readline version if we are on a platform that supports readline client/mysql.cc: Add #ifdef to only print readline version if we are on a platform that supports readline BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | BUG#2596 MySQL Client Segmentation Fault on Solaris 9unknown2005-04-251-2/+10
| | | | | | | | | | | | | | | | - Print readline or libedit version client/mysql.cc: Print the version of readline or libedit library used.
* | Upgrade to libedit-2.9unknown2005-04-211-1/+1
| | | | | | | | | | BitKeeper/deleted/.del-readline.h~ac6080227e4b72fc: Delete: cmd-line-utils/libedit/readline/readline.h
* | Merge mysql.com:/usr/home/ram/work/mysql-4.0unknown2005-04-141-13/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-4.1 client/mysqltest.c: Auto merged
| * | In order not to conflict with a Linux kernel headerunknown2005-04-141-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | set_bit replaced with internal_set_bit, clear_bit replaced with internal_clear_bit.
* | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanunknown2005-04-061-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean client/mysqlcheck.c: Auto merged mysys/my_rename.c: Auto merged
| * | Fix segmentation fault in mysqlcheck when the last tableunknown2005-03-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checked with --auto-repair mode returned an error (such as being a merge table). (Bug #9492) client/mysqlcheck.c: When testing whether the last table should be added to the list of tables to be repaired, we don't have a valid row[] to look at, so don't.
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-8866unknown2005-04-041-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean client/mysqltest.c: Auto merged sql-common/client.c: Auto merged
| * | | Fix reconnect when using prepared statements, and addunknown2005-03-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --disable_reconnect and --enable_reconnect to mysqltest so that it can be tested properly. (Bug #8866) client/mysqltest.c: Add support for --disable_reconnect and --enable_reconnect mysql-test/r/kill.result: Update results mysql-test/t/kill.test: Fix test to actually verify that killing a connection is working, and that automatic reconnect is working as desired. sql-common/client.c: Clean up MYSQL->stmts on reconnect by invalidating statements not in the MYSQL_STMT_INIT_DONE state, and reconnecting others to the new MYSQL object.
* | | | Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent' unknown2005-03-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqldump.c: Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned client/mysqldump.c: Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned
* | | | Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent' unknown2005-03-281-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was returning rows. Now I check that the resultset is not null and has at least 1 row before I process the table. mysqldump.c: Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows client/mysqldump.c: Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows
* | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-261-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 acinclude.m4: Auto merged mysql-test/r/ps_1general.result: Auto merged
| * | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-231-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | client/mysqltest.cunknown2005-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corrected number of fields for --enable_metadata sql/sql_union.cc fixed a apparent typo in assert client/mysqltest.c: corrected number of fields for --enable_metadata mysql-test/r/metadata.result: corrected number of fields for --enable_metadata mysql-test/r/ps_1general.result: corrected number of fields for --enable_metadata mysql-test/r/ps_2myisam.result: corrected number of fields for --enable_metadata mysql-test/r/ps_3innodb.result: corrected number of fields for --enable_metadata mysql-test/r/ps_4heap.result: corrected number of fields for --enable_metadata mysql-test/r/ps_5merge.result: corrected number of fields for --enable_metadata mysql-test/r/type_enum.result: corrected number of fields for --enable_metadata sql/sql_union.cc: fixed a apparent typo in assert
* | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8499unknown2005-03-251-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | | Fix 'tee' command in mysql client. (Bug #8499)unknown2005-03-151-1/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | client/mysql.cc: A va_list can't be reused without being copied or reset, so don't try to reuse it in tee_fprintf().
* | | | Fixes after Sinisa and Serg comments after push of patch for BUG#9123.unknown2005-03-161-36/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#9123 is solved earlier than this patch though.
* | | | BUG#9123: Updates after Mats reviewunknown2005-03-161-2/+2
| | | |
* | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1unknown2005-03-161-1/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | client/mysqldump.c: Auto merged
| * | | BUG#9123: If a table name is given with an underscore, unknown2005-03-151-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | then this must be properly quoted when sent to SHOW TABLES LIKE ...
* | | Bug #6660 mysqldump creates bad pathnames on Windowsunknown2005-03-151-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem. With this patch, data directory and index directory will use only forward slashes (/) when on Windows. mysqldump.c: Removed fixPaths routine. Was improper fix for bug #6660 sql_show.cc: Changed append_directory to convert backslashes to foward slashes when on Windows. sql/sql_show.cc: Changed append_directory to convert backslashes to foward slashes when on Windows. client/mysqldump.c: Removed fixPaths routine. Was improper fix for bug #6660
* | | Bug #6660 mysqldump creates bad pathnames on Windowsunknown2005-03-141-0/+22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows. However, this patch fixes the bug in mysqldump.c mysqldump.c: Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows client/mysqldump.c: Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 BitKeeper/etc/ignore: auto-union mysql-test/r/mysqldump.result: Auto merged mysql-test/t/mysqldump.test: Auto merged
| * | A fix for a bug #8830, which occured when binary data from blob wasunknown2005-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dumped with --hex-blob and --skip-extended-insert options. BitKeeper/etc/ignore: Added support-files/ndb-config-2-node.ini to the ignore list client/mysqldump.c: A fix for a bug #8830. All that was necessary was to use unsigned char instead of signed char. mysql-test/r/mysqldump.result: A result for test case for bug #8830. mysql-test/t/mysqldump.test: Test case for bug #8830.
* | | fixed conversion errors (Windows IA64 build)unknown2005-03-073-10/+8
|/ /
* | mysqldump.c:unknown2005-02-251-0/+5
| | | | | | | | | | | | | | | | Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client client/mysqldump.c: Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client
* | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-251-18/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1.b4802 BitKeeper/etc/logging_ok: auto-union client/mysql.cc: Auto merged
| * | After review fixesunknown2005-02-021-1/+2
| | | | | | | | | | | | | | | | | | | | | client/mysql.cc: check for "error" added sql/sql_db.cc: typo fixed
| * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-021-18/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1.b4802 client/mysql.cc: Auto merged include/mysql_com.h: Auto merged sql/sql_db.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | A fix (bug #4802 prompt in mysql client shows wrong database after dropping ↵unknown2004-10-211-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default db). client/mysql.cc: A fix (bug #4802 prompt in mysql client shows wrong database after dropping default db). Introduced new get_current_db() function which is called from the com_use() and the com_go() if we get SERVER_STATUS_DB_DROPPED. include/mysql_com.h: A fix (bug #4802 prompt in mysql client shows wrong database after dropping default db). SERVER_STATUS_DB_DROPPED flag added. Note: it is set to 256 to don't conflict with 5.0 ver. sql/sql_db.cc: A fix (bug #4802 prompt in mysql client shows wrong database after dropping default db). SERVER_STATUS_DB_DROPPED flag is set/unset.
* | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-221-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bkroot/mysql-4.1
| * \ \ \ Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1unknown2005-02-221-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
| | * | | | BUG#6662: Changes after Guilhems and Sergs reviewunknown2005-02-221-4/+3
| | | | | |
| | * | | | BUG#6662: Importing mysqldumps should not show any warnings of level "notes".unknown2005-02-211-0/+4
| | | | | |
* | | | | | Backport my_strntod() from 5.0unknown2005-02-221-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change string->float conversion to delay division as long as possible. This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740) client/mysql.cc: Fix wront usage of charset (found during review of pushed code) include/m_string.h: Backported my_strtod() from 5.0 mysql-test/mysql-test-run.sh: Run also mysql_client_test with --debug mysql-test/r/ps_1general.result: Safety fix (if mysql_client_test.test fails) mysql-test/r/type_float.result: More test mysql-test/t/mysql_client_test.test: Comments for what to do if this test fails mysql-test/t/ps_1general.test: Safety fix (if mysql_client_test.test fails) mysql-test/t/type_float.test: More test to better test new strtod() function Test also bug #7740 (wrong comparsion between integer and float-in-integer-range) sql/field.cc: Backport my_strntod() from 5.0 sql/item.cc: Backport my_strntod() from 5.0 sql/item.h: Backport my_strntod() from 5.0 sql/item_func.h: Backport my_strntod() from 5.0 sql/item_strfunc.cc: Backport my_strntod() from 5.0 sql/item_sum.cc: Backport my_strntod() from 5.0 sql/item_sum.h: Backport my_strntod() from 5.0 sql/procedure.h: Backport my_strntod() from 5.0 strings/ctype-simple.c: Backport my_strntod() from 5.0 strings/ctype-ucs2.c: Backport my_strntod() from 5.0 strings/strtod.c: Backport my_strntod() from 5.0 Change conversion to delay division as long as possible. This gives us more exact integer-> float conversion for numbers of type '123.45E+02'
* | | | | mysql.cc:unknown2005-02-211-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#7571: Server & Client characterset are shown under different decriptions Switch them into the correct order. client/mysql.cc: bug#7571: Server & Client characterset are shown under different decriptions Switch them into the correct order.
* | | | Applied a patch for Netware.unknown2005-02-081-0/+5
| | | |
View Lorry Controller Status