Commit graph

80 commits

Author SHA1 Message Date
msvensson@pilot.mysql.com
256cb08ba9 Merge 192.168.0.10:mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:44:05 +01:00
istruewing@chilla.local
73e61944f7 Merge chilla.local:/home/mydev/mysql-4.0-axmrg
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 08:09:36 +01:00
mtaylor@qualinost.(none)
58ae89cb76 User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0. 2007-01-26 12:00:38 -08:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8 Cleanup of thread-type (linuxthread or NTPL) detection code
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-25 20:10:31 +02:00
mtaylor@qualinost.(none)
57baef9584 Added support for /etc/mysql after /etc in the search path for my.cnf
bug #25104
2006-12-15 12:25:09 -08:00
msvensson@neptunus.(none)
22ff4c2865 Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
- Check that length of value is longer than 1 before decrementing length by 2.
 - Backport from 5.0, make it possible to use my_print_defaults in tests
2006-05-11 14:13:14 +02:00
jimw@mysql.com
7370017daf Merge mysql.com:/home/jimw/my/mysql-4.1-9136
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:11:32 -07:00
monty@mysql.com
fbf31c4a8c CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036)
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)
2005-04-29 17:03:34 +03:00
monty@mysql.com
972f86f1ee Cleanups during review 2005-04-26 23:24:59 +03:00
petr@mysql.com
75cfee68fb post review fix 2005-04-14 01:39:24 +04:00
petr@mysql.com
8139af1807 Post-review fixes for "!include" patch originating from Yahoo! (the whole patch is recommitted) 2005-03-25 04:13:30 +03:00
jimw@mysql.com
bd76a4baba Fix handling of the -e flag to my_print_defaults. (Bug #9136) 2005-03-15 15:54:57 -08:00
ramil@mysql.com
4ab10bcedf merge 2005-02-25 16:34:17 +04: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
jani@ua141d10.elisa.omakaista.fi
fe0b00985f Merge with 4.0 2004-11-12 20:38:58 +02:00
jani@ua141d10.elisa.omakaista.fi
76b8c8747d Removed an unneccessary for() and variable. 2004-11-12 19:22:58 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
jani@a80-186-24-72.elisa-laajakaista.fi
54dac2cfac Some code clean-up and optimization. 2004-11-11 16:59:36 +02:00
jani@a80-186-24-72.elisa-laajakaista.fi
4f04217879 Removed check for .ini file elsewhere, except on Windows. 2004-11-11 16:20:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
bfdf57ef31 Fixed a typo that caused segmentation fault when using
--defaults-extra-file option.
2004-11-05 23:58:30 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
083a2f5613 Changed default.c so that it now checks for my.ini and then
my.cnf from the default directories.
2004-11-05 18:59:19 +02:00
ram@gw.mysql.r18.ru
8a61200b3d A fix (bug #5056: defaults-extra-file throws no error when file is inaccessible). 2004-09-02 16:20:30 +05:00
paul@kite-hub.kitebird.com
2f0ca1ce42 Fix skipp -> skip once and for all.
(Note: This affects only comments, not variable names.)
2004-06-03 11:52:54 -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
monty@mysql.com
32d0b69503 Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
Fixed problem with symlink test (bug in 4.1.2)
2004-04-28 20:19:50 +03:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
bell@sanja.is.com.ua
23a74015f1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-conf-4.0
2004-03-23 22:11:50 +02:00
serg@serg.mylan
4f4668ef20 comment 2004-03-23 19:25:30 +01:00
bell@sanja.is.com.ua
8215fbe957 fixed config parser to recognize correctly strings like following:
test="\"#no comment here"#real comment
2004-03-20 23:50:04 +02:00
ram@gw.mysql.r18.ru
f231d9826b just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
jani@rhols221.adsl.netsonic.fi
0680d16595 Reverted an addition to be able to use ';' as a comment
starting character elsewhere than in the beginning of a line,
because it affected some innodb options that had ';'
in them.
2004-01-23 15:31:16 +02:00
lenz@kallisto.local
3ceef284df - no C++ comments in .c files, please... 2004-01-15 13:32:12 +01:00
jani@rhols221.adsl.netsonic.fi
0d19a14ade Added handling for ; comment character as there was for #.
Bug#2080
2004-01-15 04:00:21 +02:00
monty@mysql.com
8aeb63dd3b Update VC++ files
Portability fixes
After merge fixes
2003-11-21 01:53:01 +02:00
monty@narttu.mysql.fi
a444a3449f Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
2003-11-03 14:01:59 +02:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
monty@narttu.mysql.fi
45a41e85e3 Code cleanup of new patches 2003-09-23 17:06:44 +03:00
jani@rhols221.adsl.netsonic.fi
6b2cf69dca Fixed a bug in default.c, which caused quoted arguments not
being read correctly from my.cnf.
2003-09-17 21:08:40 +03:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
jani@rhols221.adsl.netsonic.fi
fc2fe36474 Removed restriction not to be able use non regular files. 2003-08-28 21:27:25 +03:00
monty@narttu.mysql.fi
8a77f97079 Add detection of in_addr_t
Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563)
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support
2003-08-28 06:08:17 +03:00
jani@rhols221.adsl.netsonic.fi
5f8ef50b35 Added a warning to my_print_defaults if --verbose is given
and --defaults-file is a non-existing or non-regular file.
Bug#755
2003-08-27 19:22:14 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
monty@narttu.mysql.fi
ecdb1c768c Changed safemalloc structure to not have to be 8 byte aligned. (Portability problem) 2003-06-12 22:39:45 +03: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
hf@deer.(none)
9ad3c1cdca SCRUM:
splittiln common client's parts
2003-06-03 15:02:57 +05:00
hf@deer.(none)
02d3d7e8bd SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
2003-05-31 15:15:46 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00