mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48464 commits 2784 branches 343 tags 1.6 GiB
Commit graph

522 commits

Author SHA1 Message Date
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
jimw@mysql.com
f1006fa620 In the command-line client, try to abort the current query by issuing a 
KILL command on a second connection when handling Ctrl-C. (WL#2852) 

Based on patch by Harrison Fisk.
 2005-10-05 12:54:04 -07: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
msvensson@neptunus.(none)
3aecb8acce Upgrade to libedit-2.9 2005-04-21 12:06:46 +02:00
geert@kriem.kemuri.org
8e671105ac \W enables show warnings, \w disables; Showing message while interactive when using the \w and \W commands; using strmov instead of my_strdup; removed case for options, my_getopt does it 2005-04-14 15:07:08 +02:00
geert@kriem.kemuri.org
e5c607e0ad Removing for-loop in print_warnings() 2005-04-08 16:54:50 +02:00
geert@kriem.kemuri.org
8c42aceb0a Adding --show-warnings option for the mysql command line tool so warnings, 
if any, are shown after execution of a statement in both batch and 
interactive mode. 
In interactive mode \w means show the warnings and \W means don't 
show the warnings.
 2005-04-05 15:30:17 +02:00
jimw@mysql.com
dee535be63 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-25 10:51:08 -08:00
georg@lmy002.wdf.sap.corp
a9fde23474 typecast fix for windows 64-bit compilation error 2005-03-16 08:51:57 +01:00
jimw@mysql.com
3a6af0b28f Change mysql prompt while inside a multiline comment. (Bug #9186) 2005-03-15 17:33:06 -08:00
jimw@mysql.com
5e0d06da82 Fix 'tee' command in mysql client. (Bug #8499) 2005-03-15 16:37:05 -08:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
jani@ua141d10.elisa.omakaista.fi
8db4423b8c Fixed Bug#8922. 
Reverted Jim's patch.
 2005-03-08 18:12:12 +02:00
georg@lmy002.wdf.sap.corp
877b2f4688 fixed conversion errors (Windows IA64 build) 2005-03-07 09:47:24 +01:00
monty@mysql.com
3839e443a4 merge with 4.1 2005-02-28 12:18:39 +02:00
ramil@mysql.com
dee22632f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b4802
 2005-02-25 15:47:36 +04:00
monty@mysql.com
e2ea35ec67 Merge with 4.1 2005-02-22 15:47:00 +02:00
monty@mysql.com
e2dc9b4099 Backport my_strntod() from 5.0 
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)
 2005-02-22 12:51:23 +02:00
bar@mysql.com
e2bd15eca2 mysql.cc: 
bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.
 2005-02-21 15:43:25 +04:00
ramil@mysql.com
8cf2b82f94 After review fixes 2005-02-02 15:52:19 +04:00
ramil@mysql.com
7f68f132fd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b4802
 2005-02-02 15:06:36 +04:00
jimw@mysql.com
85a5c61c5d Merge mysql.com:/home/jimw/my/mysql-4.1-7811 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-31 17:51:45 -08:00
jimw@mysql.com
ec98b8f235 Change 'mysql' client to output XML like the 'mysqldump' 
tool does, with the column names as attributes on <field>
elements, instead of trying to use the column name as the
element name. Also fix some encoding issues. (Bug #7811)
 2005-01-25 14:25:40 -08:00
jani@ua141d10.elisa.omakaista.fi
d5f76d50f6 Some bug fixes and a feature add to mysql-test-run 2005-01-25 18:32:09 +02:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
reggie@bob.(none)
da9f7c7ec4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql-4.1
 2005-01-17 14:08:36 -06:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
reggie@bob.(none)
68c540f090 Bug #7922 prompt \p fails on Windows for shared-memory connections 
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
 2005-01-15 23:19:34 -06:00
serg@serg.mylan
275a9293e4 protect against malicious server trying to crash command-line client :) 2005-01-14 22:46:04 +01:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
hf@deer.(none)
8b3b364893 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.5920
 2005-01-11 19:58:52 +04:00
pekka@mysql.com
195f7bda02 Merge 2005-01-08 22:34:16 +01:00
serg@sergbook.mylan
247052fecc few harmless warnings from automated code-checking tools fixed 2005-01-08 21:25:31 +01:00
hf@deer.(none)
5eb5fd12be fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file) 2005-01-03 19:21:54 +04:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
paul@frost.snake.net
66f0ff16a3 mysql.cc: 
Fix up mysql help messages.
 2004-12-18 14:30:00 -06:00
guilhem@mysql.com
1cbc904c59 Changing the default of libmysqlclient : it's now NO reconnection. 
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
 2004-12-09 14:44:10 +01:00
paul@kite-hub.kitebird.com
59c0102e23 mysql.cc: 
Tweak some help text.
 2004-11-19 14:53:40 -06:00
monty@mysql.com
3afecef4df Fix compiler warnings (detected by Intel's C++ compiler) 
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
 2004-10-22 18:44:51 +03:00
ram@gw.mysql.r18.ru
61c7767786 A fix (bug #4802 prompt in mysql client shows wrong database after dropping default db). 2004-10-21 17:02:24 +05:00
jani@a80-186-41-201.elisa-laajakaista.fi
a37355fb98 Added option --sigint-ignore to mysql.cc 2004-10-07 22:47:11 +03:00
bar@mysql.com
dcfb23f37f mysql.cc: 
SQL_SELECT_LIMIT=0 protection
 2004-09-15 13:26:47 +05:00
bar@mysql.com
1992322af5 Restoring old code to be used with 4.0 server if 4.1-compient query fails. 
Restoring displaying database and user which was removed in a mistake
in the previous change.
 2004-09-15 10:06:30 +05:00
bar@mysql.com
49728cce7e mysql.cc: 
Bug #5536: wrong server character set in "status" command
  More character set variables.
 2004-09-13 12:51:08 +05:00
hf@deer.(none)
7aa25240f7 Fix for bug #4809 (Backticks not handled in mysql) 2004-09-13 12:13:24 +05:00
paul@kite-hub.kitebird.com
a022b3c549 mysql.cc: 
Print sqlstate value in batch mode, not just in interactive mode.
 2004-09-08 13:28:11 -05:00
rburnett@build.mysql.com
751071a677 [This patch has already been approved by Serge. I am recommitting and pushing from a new repository because there were other changesets that couldn't be pushed.] 
BUG# 5229 --password=foobar does not override the empty 'password' option in the my.cnf
This is a backport of a change made by jani in the 4.1 tree.

mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option
 2004-09-08 16:31:01 +02:00
serg@serg.mylan
0afcaac5a8 after merge 2004-09-07 22:10:15 +02:00
serg@serg.mylan
323e683cbf merged 2004-09-07 21:30:28 +02:00
ram@gw.mysql.r18.ru
00830a11fc A fix (Bug #5432: Is this a leak in mysql console client?) 2004-09-07 14:24:47 +05:00
ram@gw.mysql.r18.ru
92be15da12 A fix (bug #2205 USE database doesn't work after DROP database + CREATE database) 
(Jani's CS 1.1675 04/01/05 21:45:14 was adapted an aplied).
 2004-09-06 16:48:11 +05:00
gluh@gluh.mysql.r18.ru
9700398e8b Fix for bug #4373: \u behaves differently 2004-09-03 19:56:24 +04:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is 
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
 2004-08-31 21:27:58 +05:00
paul@kite-hub.kitebird.com
30e7217d52 Names listed as options should look like options, 
not variables.
 2004-08-30 11:11:10 -05:00
paul@kite-hub.kitebird.com
f1c0b1be9e mysql.cc: 
Minor edits to help command messages.
 2004-08-27 12:27:57 -05:00
serg@serg.mylan
acbf96a161 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-26 17:49:16 +02:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
jani@rhols221.adsl.netsonic.fi
5e4df770e3 Fixed a bug in mysql.cc. Overriding password prompting 
by giving password as an argument later did not work.
 2004-08-26 16:15:36 +03:00
bar@mysql.com
65b7032857 mysql.cc: 
Bug#3453: MySQL output formatting in multibyte character sets
 2004-08-25 13:03:34 +05:00
rburnett@build.mysql.com
52a973c5ff Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into build.mysql.com:/users/rburnett/mysql-4.0
 2004-08-25 06:39:19 +02:00
serg@serg.mylan
0c950c5bfe compatibility fixes 2004-08-24 22:37:05 +02:00
vva@eagle.mysql.r18.ru
b20161b841 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2
 2004-08-24 23:38:31 +05:00
vva@eagle.mysql.r18.ru
ffacc77f22 more accurate processing of find_type result 
(Bug #4998 --protocol doesn't reject bad values)
 2004-08-24 20:13:31 +05:00
vva@eagle.mysql.r18.ru
f6a3f2cfad fixed : 
Bug #3937  	fails to compile with both gcc 3.3.3/icc8
Bug #4728  	mysql couldn't be compiled using system readline (readline-4.3)
 2004-08-24 19:23:23 +05:00
vva@eagle.mysql.r18.ru
237615bc53 fixed a Bug #4998 "--protocol doesn't reject bad values" 2004-08-23 20:55:09 +05:00
ram@gw.mysql.r18.ru
c40f3a2c97 A fix (bug #5115: Erronious Syntax Error when comment placed inside of "create table") 2004-08-20 13:37:58 +05:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
ram@gw.mysql.r18.ru
f1ab1b129f A fix (bug #5055: SQL_SELECT_LIMIT=0 crashes command line client): 
mysql outwits itself.
 2004-08-17 11:12:22 +05:00
rburnett@build.mysql.com
67003d1c98 mysql_priv.h: 
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
 2004-08-14 03:38:37 +02:00
serg@serg.mylan
8542743833 s/help all/help contents/ 
bug#4527
 2004-07-13 08:57:55 +02:00
dlenev@brandersnatch.localdomain
03b705ff44 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should 
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
 2004-05-27 17:54:40 +04:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
hf@deer.(none)
418dffe205 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.3744
 2004-05-21 22:00:12 +05:00
hf@deer.(none)
0379682ea6 Addition to the fix for bug #3791 (libmysqld mysql segfaults if can's find 
errormsg.sys)
Cleanups added
 2004-05-21 17:23:27 +05:00
monty@mysql.com
332f124bc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-19 05:09:41 +03:00
monty@mysql.com
21f1bca789 Portability fixes 
Fixed wrong number of warnings/duplicates for machines with high-byte-first
 2004-05-19 05:09:10 +03:00
serg@serg.mylan
d9ec0f2b90 after merge fix 2004-05-18 09:56:45 +02:00
hf@deer.(none)
5bca8fd46d Proposed fix for #3791 (embedded: mysql segfaults if cannot find 
errmsg.sys)
 2004-05-17 12:07:58 +05:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
ingo@mysql.com
ba0697c658 Fix a forgotten skip of space at line begin for the 'system' command. 2004-05-06 16:15:46 +02:00
serg@serg.mylan
395dc08219 don't let -B increment opt_silent twice 2004-05-06 15:13:23 +02:00
serg@serg.mylan
803279f0c7 mysql.cc: 
allow several -e on the command line
  clarify --help text
  make -B to work as advertised
  in force mode execute the rest of multi-statement line in case of error in one statement
 2004-05-05 22:47:09 +02:00
jani@rhols221.adsl.netsonic.fi
77411610ea Fixed a non-critical bug, but which affected how indent program indents 
the code.
 2004-04-05 16:28:16 +03:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
gluh@gluh.mysql.r18.ru
7e2bb11d2a Fix for bug#3041 --safe-updates option declaration anomaly 2004-03-15 19:47:51 +04:00
paul@ice.snake.net
ae18d8d64c Patch for #3068: [Prompt without seconds when set from INI file]. 
(Fix hours/seconds always to display with two digits.)
 2004-03-08 15:52:06 -06:00
harrison@corona.lordblink.com
ab1786129c Fix up history in readline implementation. 
Two things changed:
1. Repeated queries are only stored once in the history.
2. Multiline queries are stored in a concated format in the history, 
   in addition to pieces. 
(Push approved by serg)
 2004-03-03 15:54:37 -05:00
serg@serg.mylan
3d750efcb1 do not look for string characters "'` inside comments - bug#539 2004-02-26 01:05:04 +01:00
bar@bar.intranet.mysql.r18.ru
251bf4ab85 mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc: 
No needs to load charset index if the character set is build-in.
 2004-02-11 15:15:39 +04:00
monty@mysql.com
6bfede9639 Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects. Needed for proper fix for bug #2479. 
Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
 2004-02-05 10:22:08 +01:00
jani@rhols221.adsl.netsonic.fi
46aea13f20 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
 2004-01-14 17:49:17 +02:00
jani@rhols221.adsl.netsonic.fi
44c5a57cd0 Fixed a non-debug version compilation error and warning. 2004-01-14 17:48:38 +02:00
serg@serg.mylan
e883ae0915 compilation error fixed 2004-01-14 16:42:08 +01:00
jani@rhols221.adsl.netsonic.fi
2efb415121 - Added missing documentation to some mysql.cc options. 
- Fixed Bug#2346
- Fixed Bug#2378
- Fixed bug in pager (no Bug#ID (?))
- Added support for new special situations option type, GET_DISABLED.
  See handling of --debug in mysql.cc. compiled wihtout debugging, as an
  example.
 2004-01-14 04:58:37 +02:00
jani@rhols221.adsl.netsonic.fi
5ec1adee44 Fixed Bug#2205. 2004-01-05 21:45:14 +02:00
jani@rhols221.adsl.netsonic.fi
934f08c5d1 Fixed Bug#1472, mysql \h output out of order. 2003-12-30 17:58:39 +02:00
monty@mysql.com
d4c32db181 merge with 4.0.18 2003-12-19 16:42:17 +02:00
monty@mysql.com
6e58a7c49e Code cleanup 2003-12-18 01:13:52 +02:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
monty@mysql.com
d47deebb58 Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105) 
Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846)
Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812)
One can now configure MySQL as windows service as a normal user. (Bug #1802)
Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736)
IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704)
Change INSERT DELAYED ... SELECT... to INSERT .... SELECT (Bug #1983)
Safety fix for service 'mysql start' (Bug #1815)
 2003-12-14 06:39:52 +02:00
vva@eagle.mysql.r18.ru
700de3ebec changed %ld on %lu for output of mysql_thread_id(&mysql) 
as is thread_id has type ulong
(bug #1951 thread id is printed as "signed" instead of "unsigned" in 'mysql')
 2003-12-12 17:18:48 -04:00
monty@mysql.com
f266cdabab Portability fixes (for binary build) 
Added --protocol to mysqlbinlog
 2003-12-01 13:13:16 +02:00
konstantin@oak.local
2e8cf31abc Second part of WL #519: 
Client option secure-auth deployed on all possible layers:
- mysql client command-line and config file option
- mysql_options option MYSQL_SECURE_AUTH
- mysql_real_connect will automatically take into account that option if
  mysql->options.my_cnf_file/my_cnf_group is set
 2003-11-28 13:11:44 +03:00
jani@ua167d18.elisa.omakaista.fi
0b1bae4677 Added error reporting if one of the multi queries failed. 2003-11-20 20:06:51 +02:00
jani@rhols221.adsl.netsonic.fi
cc2916c459 Added multi command support for mysql client. 2003-11-20 14:33:07 +02:00
monty@mashka.mysql.fi
cab1dc628c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
 2003-11-18 13:47:27 +02:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
monty@mishka.mysql.fi
a5c83b05bd Move init_compiled_charsets to own file 
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
 2003-10-06 22:56:34 +03:00
ram@gw.mysql.r18.ru
9df504d277 Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULL 2003-10-06 15:47:17 +05:00
jani@rhols221.adsl.netsonic.fi
33250a01ba Fixed Bug#1291, client displays wrong prompt when in the middle of 
backticks.
 2003-09-17 21:41:36 +03:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes. 
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
 2003-09-11 19:06:23 +03:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
fe9dc5e711 Add column names for metadata when running mysql with -T 
Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324
 2003-08-27 10:26:03 +03:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _) 
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
 2003-08-27 02:51:39 +03:00
monty@mashka.mysql.fi
4f7512160b After merge fixes 
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
 2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
ram@mysql.r18.ru
bc753e138c bugfix for the bugfix for the bug #539 2003-07-15 17:38:01 +05:00
ram@mysql.r18.ru
e1aaa670cc mysql should ignore ' " ` symbols inside comments (Bug #539). 2003-07-15 14:38:48 +05:00
monty@narttu.mysql.fi
f3af0d7ce4 Status query on killed mysql connection results in segmentation fault (Bug #738) 
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766)
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
 2003-07-04 03:18:15 +03:00
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables 
Tests cleanup (put drop database first in tests)
 2003-07-03 11:55:36 +03:00
monty@narttu.mysql.fi
1e62d6070a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-06-14 11:38:09 +03:00
monty@narttu.mysql.fi
a1034db4b9 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol 
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
 2003-06-14 11:37:42 +03:00
serg@serg.mylan
9f67e10d0d consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol 
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
 2003-06-04 18:28:51 +03:00
Sinisa@sinisa.nasamreza.org
9bd57aa40e Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-02 14:14:10 +03:00
vva@eagle.mysql.r18.ru
b4014b903b new version of help 2003-05-29 17:47:31 -04:00
bar@bar.mysql.r18.ru
67c6703463 --with-collation argument for configure. Now one can for example use this: 
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
 2003-05-28 16:23:04 +05:00
bar@bar.mysql.r18.ru
7ffcf6f64a "mysql" now sends client character set to server. 2003-05-28 13:54:18 +05:00
monty@narttu.mysql.fi
bdb66d24dd ORDER BY optimization 
Fixed new bug when reading field types
 2003-05-27 18:40:37 +03:00
monty@narttu.mysql.fi
381492093e Fixed problem with mysql prompt when server disconnect. (Bug 356) 
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)
 2003-05-27 16:40:14 +03:00
bar@bar.mysql.r18.ru
b1adadd510 mysqlimport.c, mysqldump.c, mysqlcheck.c: 
Bug fix: latin1 is not compiled charset and is not specified..
mysql.cc:
  Bug fix: latin1 is not compiled charset and is not specified...
 2003-05-22 14:37:01 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
Sinisa@sinisa.nasamreza.org
07c2c4a67c A fix for the crashing bug in mysql client program 2003-05-01 20:01:39 +03:00
serg@sergbook.mysql.com
1d9d1221f0 do not execute \* commands inside identifiers 2003-04-23 22:46:47 +04:00
jani@hynda.(none)
8c8ebd5c14 Added --delimiter option to mysql 2003-04-23 03:29:03 +03:00
vva@eagle.mysql.r18.ru
4250b44dc9 fixed bug with locales in libedit 2003-04-06 20:14:36 -04:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
jani@hynda.(none)
75015595b1 Fixed a bug when printing error messages. stdout and stderr were 
mixed wrongly sometimes.
 2003-04-03 19:55:37 +03:00
bar@bar.mysql.r18.ru
0002beb7a4 my_strncasecmp() is not used anymore. Use my_strncoll() instead. 2003-04-01 14:17:28 +05:00
greg@mysql.com
080b73ee18 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches 2003-03-28 14:24:32 -05:00
greg@mysql.com
67985efed5 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC 2003-03-21 16:45:39 -05:00
jani@rhols221.adsl.netsonic.fi
3d090552da Fixed a bug in comment handling. 2003-03-21 14:14:36 +02:00
monty@narttu.mysql.fi
b883a9c01c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
jani@hynda.(none)
5eddd40bc9 Fixed a bug in --one-database. 2003-03-17 15:50:56 +02:00
root@home.(none)
1daed63ed8 mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc: 
system_charset_info was removed
 2003-03-16 11:20:45 +04:00
root@home.(none)
f71a7e4b05 set_default_charset() is not used anymore 
Some system_charset_info were removed
 2003-03-16 10:56:14 +04:00
Sinisa@sinisa.nasamreza.org
eebc00a531 A fix for mysql client program when use or connect were used 
without arguments ...
 2003-03-12 21:43:40 +02:00
papa@gbichot.local
b9d94d2b6f Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client. 
Disabling can be safer when the server silently dies & restarts.
This is for SCRUM task #727.
 2003-03-01 23:34:34 +01:00