Commit graph

375 commits

Author SHA1 Message Date
tim@siva.hindu.god
c704130389 BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long. 2005-10-28 12:13:34 +13:00
kent@mysql.com
70c816c801 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-20 23:23:33 +02:00
reggie@ugeek.(none)
600c7df8f1 readd the my_cgets call that SergeyV originally put in 2005-10-18 17:53:09 -05:00
bar@mysql.com
e7fa41ebf7 mysql.cc:
After merge fix.
2005-10-14 14:19:15 +05:00
bar@mysql.com
aec79cc463 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-10-14 14:17:15 +05:00
bar@mysql.com
48238e1b90 Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
into  mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 14:07:22 +05:00
monty@mysql.com
17d7ba931d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-10-08 03:37:23 +03:00
gluh@mysql.com
041eab4663 4.1 -> 5.0 merge 2005-10-07 14:26:32 +05:00
monty@mysql.com
78e828d32f Review of code pushed since last 5.0 pull:
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
georg@lmy002.wdf.sap.corp
f846bc32c1 Windows compilation fix: Added typecast (const char* to char *) 2005-10-04 10:54:58 +02:00
kent@mysql.com
7b2e04d5a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 16:37:02 +02:00
kent@mysql.com
21cf818a8d Many files:
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
2005-09-30 14:03:55 +02:00
bar@mysql.com
ceb541e4bc Bug#13487 Japanese data inside a comment causes the syntax error
mysql.cc:
  Fixed not to copy multibyte characters to the
  target string if we are inside a comment.
2005-09-28 15:46:09 +05:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
monty@mysql.com
ea6d5f9ec3 Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
serg@serg.mylan
a083ff160e merged 2005-09-21 13:53:22 +02:00
SergeyV@selena.
2e9e0b33c5 Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating
a restriction to 255 chars for editable buffer.
2005-09-16 01:56:16 +04:00
jimw@mysql.com
25adba36b1 Merge mysql.com:/home/jimw/my/mysql-5.0-11523
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 10:02:23 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-08-26 15:56:52 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
serg@sergbook.mysql.com
2870638ef2 client/mysql.cc
mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in
    autoconf 2.52 is enough to build mysql-5.0
2005-08-14 14:06:47 +02:00
acurtis@xiphis.org
b9476f7d50 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
into  xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
jimw@mysql.com
397cef9413 Fix 'source' command in mysql client to handle delimiter command
in sourced file properly. (Bug #11523)
2005-08-09 12:17:28 -07:00
patg@krsna.patg.net
74c7168992 BUG #12119
Removed unnecessary error message from mysql.cc (client program)
2005-08-08 13:50:10 -07:00
monty@mishka.local
8437e9c1be Fixes during review of new pushed code
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
monty@mishka.local
78c65b5adc Cleanups during review
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
jimw@mysql.com
99e35c84ac Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-20 15:02:45 -07:00
jimw@mysql.com
5381e18673 Fix handling of command-line on Windows, missed as part of earlier
commit. (Bug #10840)
2005-06-20 18:54:45 +02:00
jimw@mysql.com
55f962c0cf Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-10 20:11:20 -07:00
jimw@mysql.com
e4cb794750 Fix use of _cgets() to handle an input line that exceeds our buffer space
before a newline is found. (Bug #10840)
2005-06-09 19:44:59 +02:00
jimw@mysql.com
9ba4a6c722 Fix calculation of buffer size for _cgets() on Windows. (Bug #10841) 2005-06-08 00:43:57 +02:00
monty@mysql.com
4b7882dc73 merge 2005-06-05 17:19:50 +03:00
serg@serg.mylan
d26c13b439 client/mysql.cc
make print_field_types() somewhat more useful
2005-06-03 21:59:33 +02:00
monty@mysql.com
a69f432115 Code cleanups during code reviews
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
2005-06-01 16:35:09 +03:00
kent@mysql.com
318c41e94d default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
  Removed unused variable 'field' from print_warnings()
libmysql.dsp:
  Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
  Added "my_chsize.c"
2005-05-18 12:15:28 +02:00
monty@mysql.com
3b3d00c4a2 Merge with 4.1 to get fix for memory leak 2005-05-16 20:21:38 +03:00
monty@mysql.com
8b1673f18e Fix memory leak 2005-05-16 20:16:46 +03:00
serg@serg.mylan
40ce1e174d merged 2005-05-14 19:28:29 +02:00
antony@ltantony.mysql.com
7a56977a79 Bug#6925
Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required.
2005-05-08 00:13:35 +01:00
jimw@mysql.com
80933d9f95 Merge 2005-05-07 08:25:58 -07:00
jimw@mysql.com
7e7ed0f6a8 Merge mysql.com:/home/jimw/my/mysql-4.1-9186
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:05:19 -07:00
rburnett@bk-internal.mysql.com
82f4a0b021 Merge bk-internal.mysql.com:/users/rburnett/bug10245
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
2005-05-06 15:21:30 +02:00
rburnett@bk-internal.mysql.com
8e286b7934 Bug #10245 VC++ compiler error with mysql.cc
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
2005-05-05 17:48:50 +02:00
geert@kriem.kemuri.org
0dab212f5c Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-29 14:46:53 +02:00
geert@kriem.kemuri.org
166af66440 Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-27 14:17:50 +02:00
msvensson@neptunus.(none)
203cdde955 Merge from 4.1 to 5.0 2005-04-27 12:56:01 +02:00
jani@ua141d10.elisa.omakaista.fi
0ca934de63 Improved client internal help.
Doc fix for Bug#9870.
2005-04-26 14:02:16 +03:00
msvensson@neptunus.(none)
e0edc9a630 BUG#2596 MySQL Client Segmentation Fault on Solaris 9
- Print readline or libedit version
2005-04-25 12:05:13 +02:00
geert@kriem.kemuri.org
e432a7b263 Removing useless mysql_field_seek 2005-04-25 09:51:37 +02:00