Commit graph

1050 commits

Author SHA1 Message Date
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
monty@mysql.com
042af556d5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-20 12:50:12 +02:00
monty@mysql.com
59f9dcd51d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-20 12:49:17 +02:00
bar@bar.intranet.mysql.r18.ru
f3c4bda023 uca-dump.c:
new file
2004-03-19 16:29:37 +04:00
bar@bar.intranet.mysql.r18.ru
fc17aad767 min_sort_char was added, for the future UCA implementation.
UCS2 now has its own my_like_range function.
2004-03-19 10:00:46 +04:00
monty@mysql.com
75dda82526 Removed compiler warning
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
2004-03-18 14:53:38 +02:00
serg@serg.mylan
b044a4266b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-16 22:25:16 +01:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
monty@mysql.com
4ee44751d9 Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882) 2004-03-10 13:46:11 +02:00
serg@serg.mylan
3d7bb0f970 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-07 22:07:12 +01:00
monty@mysql.com
ef971bb604 Ensure that one can't from the command line set a variable too small. (Bug #2710)
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"
2004-03-06 10:43:35 +02:00
monty@mysql.com
9618683f3c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-05 19:50:12 +02:00
monty@mysql.com
8f093d0fb3 Portability fixes 2004-03-05 19:49:50 +02:00
serg@serg.mylan
4edc7584de comment clarified 2004-03-05 18:09:32 +01:00
greg@mysql.com
54c1debc1c Enhanced my_getsystime for NetWare. 2004-03-04 22:59:04 -01:00
monty@mashka.mysql.fi
93dd971bed Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-03-04 10:07:32 +02:00
monty@mashka.mysql.fi
afd8f38f4e Optimized GIS functions 2004-03-04 08:50:37 +02:00
serg@serg.mylan
a05c54b6c2 my_getsystime() 2004-03-02 22:21:12 +01:00
serg@serg.mylan
ed2e1aa14d my_gethwaddr() for linux/freebsd
UUID() function
2004-02-27 20:30:08 +01:00
serg@serg.mylan
e58f1ca7f8 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-26 00:25:35 +01:00
serg@serg.mylan
4442cf5b6f in netware ':' is also a valid path character 2004-02-24 23:15:38 +01:00
monty@mashka.mysql.fi
1ae05760ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-22 11:01:28 +02:00
serg@serg.mylan
fc16e4ded3 fix for --open-files-limit and broken query_cache_merge.test 2004-02-20 23:42:06 +01:00
monty@mashka.mysql.fi
494e43c1f5 merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
monty@mysql.com
14dc56b2a1 Fixed usage of strxnmov() in recent changesets 2004-02-19 22:04:31 +02:00
monty@mashka.mysql.fi
cdaf7fcbc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-19 19:38:47 +02:00
monty@mashka.mysql.fi
e347f63192 Max open files handling moved to my_set_max_open_files()
This ensures that my_file_info takes this the max number of files into account and one can now use --open-files-limit on windows to increase number of used files up to 2048
2004-02-19 19:33:09 +02:00
serg@serg.mylan
7a03cf04af potential problem fixed afer some reasoning 2004-02-19 09:11:46 +01:00
serg@serg.mylan
abfa3f0a98 missing semicolon 2004-02-17 21:12:24 +01:00
wax@mysql.com
67677dcba8 Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1
2004-02-17 05:15:10 +05:00
wax@kishkin.ru
f38b08af91 correct cleaning of TZ
add a check of the version Visual C
2004-02-17 05:09:42 +05:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
monty@mysql.com
f43093ec0e After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
2004-02-16 10:03:25 +02:00
serg@serg.mylan
01c2ca5b8a Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-13 15:30:00 +01:00
serg@serg.mylan
4680c86bff warning: `link_into_queue' declared inline after being called
warning: `unlink_from_queue' declared inline after being called
let's un-inline them, compiler can usually decide better what should be inlined
2004-02-12 18:35:44 +01:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
konstantin@mysql.com
2a4cfe8b4f merge 3.23 -> 4.0, 2003/02/06 2004-02-06 15:23:41 +03:00
serg@serg.mylan
415dff4909 reverted
fixed in 4.0 properly
2004-02-05 22:08:29 +01:00
monty@mysql.com
480b082cf4 merge 2004-02-05 18:14:48 +01: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@ua141d10.elisa.omakaista.fi
a3dc5449e9 Added new option --sync-frm / --skip-sync-frm
Marked --bdb-no-sync as deprecated
Added --sync-bdb-logs / --disable-sync-bdb-logs as a synonym / alternative.
2004-02-03 18:10:45 +00:00
konstantin@mysql.com
74a1d68d3b Proposed (version #2) fix for bug #1948:
"system variable query_prealloc_size can be only global"
2004-02-02 23:01:58 +03: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
serg@serg.mylan
b68a83a050 patch reverted - USE_RAID is defined in my_config.h 2004-01-23 11:56:37 +01:00
serg@serg.mylan
fbf4299b5c Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-01-22 14:46:54 +01:00
serg@serg.mylan
905a548ee8 no unnecessary includes (Intel ecc 7.0 compatibility fix) 2004-01-21 20:25:49 +01:00
monty@mysql.com
b078d2df64 merge 2004-01-20 00:15:01 +01:00
monty@mysql.com
0eb6070068 Code cleanup
Fixed bug in optimizer where it didn't choose right table order in some cases
2004-01-19 23:51:17 +01:00
bar@bar.intranet.mysql.r18.ru
f802ec0215 UCS-2 aligning 0xAA -> 0x00AA 2004-01-19 19:16:30 +04:00
konstantin@mysql.com
5def5b6853 typo fixed PPTHREAD -> PTHREAD 2004-01-16 21:01:58 +03:00
bar@bar.intranet.mysql.r18.ru
1d75d8d5aa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-01-15 17:08:45 +04:00
bar@bar.intranet.mysql.r18.ru
db83208d36 charset.c:
http://bugs.mysql.com/bug.php?id=2386
  Index.xml file larger than 1024*16
  Fix for the above bug.
2004-01-15 17:07:29 +04: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
1cc08ed699 Fixed Bug#2123, mysqld segmentation faulted when it tried to
open a file that already existed. The problem was that end_io_cache()
was called even if init_io_cache() was not. This affected both
OUTFILE and DUMPFILE (both fixed). Sometimes wrongly aligned pointer was freed,
sometimes mysqld core dumped.

Other problem was that select_dump::send_error removed the dumpfile,
even if it was created by an earlier run, or by some other program, if
the file permissions just permitted it. Fixed it so that the file will
only be deleted, if an error occurred, but the file was created by mysqld
just a moment ago, in that thread.

On the other hand, select_export did not handle the corresponding garbage
file at all. Both fixed.

After these fixes, a big part of the select_export::prepare and select_dump::prepare
code became identical. Merged the code into a new function called create_file(),
which is now called by the two latter functions.

Regards,
Jani
2004-01-15 06:48:31 +02: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
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
bar@bar.intranet.mysql.r18.ru
042fe0bed4 charset.c:
Fixed: client crashed when there are no Index.xml file.
2004-01-12 14:31:04 +04:00
bar@bar.intranet.mysql.r18.ru
10f0bf3507 charset.c:
he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:
2003-12-24 16:04:26 +04:00
bar@bar.intranet.mysql.r18.ru
c49773237d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-12-19 19:15:55 +04:00
bar@bar.intranet.mysql.r18.ru
5be2b8b11a Fix for Bug#2151:
"USE db"  affected the character set of further CREATE DATABASEs,
which should have not happened.
2003-12-19 19:12:11 +04:00
monty@mysql.com
031390a9a4 Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
2003-12-19 16:25:50 +02:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
monty@mysql.com
56f0abf7bb Portability fixes (mostly test suite)
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1)
Fix when using symlinked data files and realpath() is not working
2003-12-16 13:20:17 +02:00
monty@mysql.com
bd92d9b9ae Merge 2003-12-13 04:04:38 +02:00
monty@mysql.com
f995a5f4aa Fix autoincrement for signed columns (Bug #1366)
Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test
2003-12-12 22:26:58 +02:00
dlenev@mysql.com
d7ebfbab1c Fix for Bug #1952
"SHOW TABLE STATUS very slow w/large number of tables"
Replaced old algorithm which were used in my_dir() and stored
all information about directory entries in one chunk of memory
with new one which stores file names and MY_STAT structures in
separate memroot, so now we don't need to copy this data during
reallocation of dir_entry array.
2003-12-12 03:39:29 +03:00
monty@mysql.com
64d7e0162c Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-12-11 06:24:32 +02:00
monty@mysql.com
7e92336b1d Fixed a possible memory leak on MacOSX when using the shared libmysql.so library (Bug #2061)
mysql_server_init() now returns error code if something went wrong (Bug #2062)
Don't use my_fopen() when reading symlink information as this may cause problems when a lot of files are opened.
Free thread keys with pthread_key_delete() instead of relying on automatic free. (Bug #2062)
Fixed bug in UNION statement with alias '*'. (Bug #1249)
Fixed a bug in DELETE ... ORDER BY ... LIMIT where the rows where not deleted in the proper order. (Bug #1024).
FOUND_ROWS() could return incorrect number of rows after a query with an impossible WHERE condition.
HOW DATABASES doesn't anymore show .sym files (on windows) that doesn't point to a valid directory. (Bug #1385)
2003-12-11 06:24:08 +02:00
hf@deer.(none)
980345345e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.1890
2003-12-10 18:41:11 +04:00
monty@mysql.com
6a95123971 Added checking of return value from my_once_alloc() in charset
Added checking of return value from malloc() in reg_init()
2003-12-10 00:00:20 +02:00
igor@rurik.mysql.com
28113396ec key_cache.result, key_cache.test, mf_keycache.c:
Fixed a wrong return code by the function init_key_cache.
2003-12-09 13:29:38 -08:00
serg@serg.mylan
b2e6b36487 fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
(isn't it obvious ?)
2003-12-06 19:05:26 +01:00
hf@deer.(none)
431a66e85d Fix for #1890 and #1959
This bug happens under Windows & Embedded server
Reason is that pthread_self() always returns NULL in this case.
This confuses thr_lock function and it doesn't stop
thread inserting in the write-locked table.

Global problem is that there's no way under Windows to get
unique thread handle for working thread.
Monty made a workaround for server - we store the thread's handle
we get when we create thread in the thread-specific variable.
This doesn't work with the embedded library for we don't control
thread creation there.

I added code that sets CurrentThreadId as the pthread_self
for the embedded library.
It seems to solve problem because it's unique and we don't use
pthread_self as a parameter for thread functions in embedded library.
2003-12-05 21:45:19 +04:00
monty@mysql.com
7f9466a717 Merge 2003-11-28 13:31:38 +02:00
monty@mysql.com
ede8169d24 Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
igor@rurik.mysql.com
e54f7400ab mf_keycache.c:
Fixed typo that caused blocking key cache usage after resize.
  Removed wrong re-initialization of resize queue in init_key_cache.
2003-11-25 17:21:43 -08:00
igor@rurik.mysql.com
910cd51e59 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-2
2003-11-25 12:00:16 -08:00
igor@rurik.mysql.com
f6ca51feff mf_keycache.c, keycache.h:
Fix for the resize key cache operation.
2003-11-25 10:40:14 -08:00
lenz@mysql.com
9d3e811024 - The LGPL section was removed from manual.texi, hence we now use a local
copy of COPYING.LIB (moved from the mysys subdirectory) instead of 
   creating it on the fly out of the manual.
2003-11-25 17:26:19 +01:00
jani@rhols221.adsl.netsonic.fi
6c1c262dc1 Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
did not call get_one_option().
2003-11-24 13:25:23 +02:00
jani@rhols221.adsl.netsonic.fi
b137384a38 Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
did not call get_one_option().
2003-11-24 13:25:08 +02:00
monty@mysql.com
d08945498e Fixed memory leak with RAID tables
Fixed tests for RAID tables
Detect uninitialized mutexes on lock and destroy
2003-11-21 14:41:57 +02:00
monty@mysql.com
8aeb63dd3b Update VC++ files
Portability fixes
After merge fixes
2003-11-21 01:53:01 +02:00
monty@mysql.com
7c6113a39f Merge key cache structures to one
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
pem@mysql.comhem.se
1d300f81d0 Fixed C syntax error in mysys/mf_keycache.c. 2003-11-19 09:45:49 +01:00
monty@mashka.mysql.fi
a47d56088f Merge with 4.0 tree 2003-11-18 18:54:27 +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@mashka.mysql.fi
2846a16c57 Merge with 3.23 (only comment changes) 2003-11-17 16:16:56 +02:00
monty@mashka.mysql.fi
a651262a10 Merge service name code 2003-11-17 13:10:07 +02:00
monty@mashka.mysql.fi
0d348eeab2 Fix for service names on windows; Now we always put the service name last when we create a service 2003-11-17 13:06:32 +02:00
monty@mashka.mysql.fi
ea337204cb Safety fix for alarms on windows. 2003-11-17 12:59:07 +02:00
monty@narttu.mysql.fi
f763d4c31d Removed some warnings reported by valgrind
After merge fixes.
Now code compiles, but there is still some valgrind warnings that needs to be fixed
2003-11-04 14:09:03 +02:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
monty@narttu.mysql.fi
6b79cd5c23 Merge 2003-11-03 22:48:03 +02:00
serg@serg.mylan
bda251c37a compatibility fixes 2003-11-03 13:55:25 +01: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@mysql.com
4668b54837 Call my_sync() after all data is written to .frm file
Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.
2003-11-02 15:55:02 +02:00
serg@serg.mylan
74551a72ec Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-31 10:34:34 +01:00
serg@serg.mylan
e5d6035188 post-merge fixes 2003-10-30 21:04:09 +01:00
igor@rurik.mysql.com
f29ed57531 Merge 2003-10-30 10:45:28 -08:00
serg@serg.mylan
9c4049ad12 Bitmap post-review fixes 2003-10-30 19:17:57 +01:00
konstantin@mysql.com
af02e27e3f fix for bug #1634 '"operator new" in my_new wastes memory' 2003-10-30 12:25:15 +03:00
serg@serg.mylan
6e17f4f20d fixes to Bitmap class 2003-10-24 22:44:48 +02:00
serg@serg.mylan
f944fd4a65 merged 2003-10-21 11:58:43 +02:00
monty@mashka.mysql.fi
b1dba93cdb Safety fix to detect multiple calls to my_thread_end()
Portability fix (For Mac OS X)
2003-10-16 20:55:15 +03:00
monty@mashka.mysql.fi
e87c9f5ff8 merge with 4.0 2003-10-16 03:08:40 +03:00
monty@mashka.mysql.fi
84d9d98078 Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
2003-10-15 21:41:13 +03:00
serg@serg.mylan
0ee817e737 cleanup 2003-10-15 18:05:04 +02:00
monty@mashka.mysql.fi
4897c6649d Updated comments 2003-10-15 16:55:24 +03:00
serg@serg.mylan
50d9b95b77 merged 2003-10-15 12:25:44 +02:00
serg@serg.mylan
8cc3951c8f key_map with more that 64 bits width 2003-10-11 13:06:55 +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
serg@serg.mylan
2667d7f8cc fix_max_connections to resize alarm_queue (Bug #1435) 2003-10-06 14:11:16 +02:00
igor@rurik.mysql.com
17aecac32c Manual merge after improving concurrency for key cache reassignment 2003-10-01 20:16:36 -07:00
igor@rurik.mysql.com
8e5c62190f Many files:
Improved concurrency for key cache reassignment
2003-10-01 18:20:07 -07:00
monty@mishka.mysql.fi
c22c1d8a4d merge 2003-09-24 10:24:56 +03:00
lenz@kallisto.local
5ce5a68b4e - Code cleanup: replaced C++-style comments with the proper syntax for
.c files (the IBM Visual Age C compiler aborts with a syntax error
   on these)
2003-09-24 08:35:02 +02:00
monty@narttu.mysql.fi
45a41e85e3 Code cleanup of new patches 2003-09-23 17:06:44 +03:00
bar@bar.mysql.r18.ru
a5cc38fa01 charset.c:
comp_err failed to compile error message file when a
  character set was not incompiled.
2003-09-23 10:41:58 +05:00
bar@bar.mysql.r18.ru
99e2a82168 Bug 1350 fix 2003-09-22 11:11:36 +05:00
bar@bar.mysql.r18.ru
1c5b5ee0ec Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-19 15:19:15 +05:00
bar@bar.mysql.r18.ru
e0a0790ebb Fixed that multibyte charsets didn't honor multibyte
sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.
2003-09-19 15:18:19 +05:00
hf@deer.(none)
a2dbfaefa3 SCRUM
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
2003-09-19 14:44:31 +05: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
bar@bar.mysql.r18.ru
731b8392ee Charset number is now stored into error.sys by comp_err and loaded by mysqld. 2003-09-17 16:22:58 +05:00
monty@mashka.mysql.fi
f300e3a164 Remove 'extern' references from .cc files 2003-09-13 11:35:29 +03:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
serg@serg.mylan
2fcab1c2ee CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] 2003-09-03 11:34:32 +02: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@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
igor@rurik.mysql.com
055daee79d Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-26 15:16:29 -07:00
monty@narttu.mysql.fi
753cb8509c Cleanups
BTREE, HASH and RTREE are not reserved symbols anymore
2003-08-26 17:52:54 +03:00
igor@rurik.mysql.com
40193a7fa5 Manual merge 2003-08-26 00:13:22 -07:00
monty@narttu.mysql.fi
2c1f1206c3 Better fix for myisamchk --sort-index on windows
Fixed deadlock bug when doing resize of key buffer while key buffer was in active use
2003-08-25 17:19:44 +03:00
monty@narttu.mysql.fi
f83e876065 Update of VC++ project files (to remove link warnings)
Fix unlock error in myisamchk on windows when doing --sort-index
Use SetFilePointer instead of SetFilePointerEx
2003-08-25 14:27:32 +03:00
serg@serg.mylan
58bdc6f5e1 use crc32() from bundled zlib if system zlib is unavailable 2003-08-21 18:30:43 +02:00
guilhem@mysql.com
6e32e19047 Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we write
the first 4 bytes of the relay log. Indeed comments in mysys/mf_iocache.c 
say we must always use my_b_append for such a cache.
This *could* avoid a very rare assertion failure which is: 
030524 19:32:38  Slave SQL thread initialized, starting replication in log 'FIRST' at position 0, relay log '/
users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000001' position: 4
030524 19:32:38  next log '/users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000002' is currently active
mysqld: mf_iocache.c:701: _my_b_seq_read: Assertion `pos_in_file == info->end_of_file' failed.
and which seemed to happen always when the SQL thread and/or the I/O thread
were at position 4 in a relay log.
2003-08-19 17:00:36 +02:00
monty@mashka.mysql.fi
10c4acfb4f merge 2003-08-19 00:10:21 +03:00
monty@mashka.mysql.fi
a9146ace70 Cleanups to recent patches
Fix packet error when using wrong GRANT command
2003-08-15 09:54:19 +03:00
wax@mysql.com
df3b982195 nothing interesting 2003-08-13 03:22:34 +06:00
serg@serg.mylan
7c5ba4f6fa Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-12 19:44:13 +02:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
dlenev@dlenev.mshome
921ac8af8b Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345) 2003-08-11 23:43:01 +04:00
wax@mysql.com
10f4883c83 Merge mysql.com:/home/wax/mysql/mysql-4.0
into mysql.com:/home/wax/mysql/mysql-4.0chsize
2003-08-10 05:40:16 +06:00
wax@mysql.com
88510546f1 BUG
replace HAVE_SETFILEPOINTER with __WIN__
2003-08-10 05:38:08 +06:00
igor@rurik.mysql.com
2813cd1f0b set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:
Added key cache parameters for midpoint insertion strategy
Many files:
  Added midpoint insertion strategy for key cache
mi_test2.c:
  Added a parameter to resize_key_cache
2003-08-09 11:12:22 -07:00
monty@mashka.mysql.fi
8f08c511ee Review of changesets since last pull.
(Mostly code cleanups)
2003-08-07 20:16:37 +03:00
serg@serg.mylan
79922d946a table checksum background:
my_checksum() mysys function
   NISAM checksum code moved from mysys to isam/ - it's obsolete
   MyISAM checksum code moved to mysys
   table's checksum accessible from sql layer
   SHOW TABLE STATUS shows checksum (WL#646)
code cleanup
2003-08-05 21:14:15 +02:00
igor@rurik.mysql.com
f7adcbff7b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-02 03:27:13 -07:00
igor@rurik.mysql.com
9306f55d8e Many files:
Added key cache assignment
mi_locking.c:
  Added key cache assignment: correction
my_sys.h:
  Added key cache variable structure
2003-08-02 02:43:18 -07:00
wax@mysql.com
5eb2c03f84 Merge mysql.com:/home/wax/mysql/mysql-4.0
into mysql.com:/home/wax/mysql/mysql-4.0chsize
2003-07-31 04:17:42 +06:00
wax@mysql.com
99df703bcb BUG
Add functions SetFilePointerEx and SetEndOfFile for huge 
tables instead of chsize
Move chsize to right place
2003-07-31 04:14:36 +06:00
miguel@hegel.local
33c47c7ead Fix for service issue with paths having spaces (bug #687) 2003-07-23 21:57:44 -04:00
serg@serg.mylan
2cac8f0768 now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
serg@serg.mylan
3ca302dbac bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error 2003-07-20 12:26:18 +02:00
monty@narttu.mysql.fi
2bca1221cd Removed wrong "Found lock of type # that is write and read locked" warnings. 2003-07-18 04:37:37 +03:00
monty@narttu.mysql.fi
7b8a54b512 Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR 2003-07-18 04:04:24 +03:00
igor@rurik.mysql.com
26ecd86539 Conflict resolution 2003-07-16 13:35:34 -07:00
monty@mashka.mysql.fi
ebcc7b5a4f Support for variables with components
Added framework to create/drop and manager buffers for multiple key caches
2003-07-06 19:09:57 +03:00
miguel@hegel.(none)
7fd579148d Fix VC++ compiler error on Windows 2003-07-02 20:34:19 -04:00
Sinisa@sinisa.nasamreza.org
b7644c9212 merge changes 2003-07-02 00:26:23 +03:00
monty@mashka.mysql.fi
cd2de0a5eb Fixed testcases and bug introduced by last changeset 2003-07-01 17:59:42 +03:00
monty@mashka.mysql.fi
baf9baba2a merge 2003-07-01 15:57:45 +03:00
monty@mashka.mysql.fi
a6755acb4e Fix needed to support MERGE tables in different databases 2003-07-01 15:49:32 +03:00
igor@rurik.mysql.com
236560e8b3 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-30 09:53:04 -07:00
igor@rurik.mysql.com
10a8adc1b5 Many files:
Added multiple key cache
2003-06-30 09:41:41 -07:00
jani@rhols221.adsl.netsonic.fi
1c38e1790a Made check for structured option handling more robust and faster.
Earlier it could have failed in some special cases.
2003-06-30 15:49:29 +03:00
serg@serg.mylan
c7c9e35c8b Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-27 22:31:28 +02:00
jani@rhols221.adsl.netsonic.fi
541b0d5322 Added support for structured options (WL task ID 947). 2003-06-27 18:51:39 +03:00
monty@mashka.mysql.fi
5f556f11e0 Fixed memory allocation in Unique to not allocate too much memory 2003-06-26 07:56:55 +03:00
Sinisa@sinisa.nasamreza.org
66b60b57af Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-25 18:40:31 +03:00
serg@serg.mylan
52de7a7bd5 Merge 2003-06-24 21:15:40 +02:00
monty@narttu.mysql.fi
28e96d95c5 Simple code cleanup 2003-06-23 20:05:54 +03:00
igor@rurik.mysql.com
5425591503 Merge 2003-06-18 07:31:23 -07:00
Sinisa@sinisa.nasamreza.org
833e3db2a7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-17 16:24:31 +03:00
serg@serg.mylan
9a94d6d729 comment added 2003-06-16 13:18:57 +02: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
monty@narttu.mysql.fi
9e5ec9a5f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-12 22:40:08 +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
serg@serg.mylan
977c66b4e7 removed a wrong cast that limited ulonglong options to max. ulong value. 2003-06-12 18:46:12 +02:00
monty@narttu.mysql.fi
a79bdf2ee7 Indentation 2003-06-12 16:25:26 +03:00
igor@rurik.mysql.com
a0f3dcc3c8 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f928a0c499 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-12 06:20:11 -07:00
igor@rurik.mysql.com
f547f2769f Many files:
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.
2003-06-12 04:29:02 -07:00
monty@narttu.mysql.fi
d640ff4a97 Don't install signal handler for SIGINT by default
Added option --gdb
Free memory used by replicate_xxx and binglog_xxx options
2003-06-10 21:42:29 +03:00
monty@narttu.mysql.fi
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
monty@narttu.mysql.fi
e6cdc81613 Added function comment 2003-06-05 17:25:09 +03:00
monty@narttu.mysql.fi
772adcbd99 Print error if we can't delete an alarm
More debugging variables
Increment aborted_threads in case of killed or too big packet
2003-06-05 12:29:13 +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
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
monty@narttu.mysql.fi
f6a365a532 Small fixes (nothing nameworthy) 2003-06-01 23:40:01 +03:00
Sinisa@sinisa.nasamreza.org
ec4a0ee477 several bug fixes 2003-05-31 21:35:20 +03: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
eedca52b23 Fix for 64 bit machines (To remove warnings on Itanium) 2003-05-26 19:11:22 +03:00
bar@bar.mysql.r18.ru
31d0d44919 --with-charset was not up to date
ctype_ucs2 and ctype_ujis were skipped in mistake
2003-05-26 20:22:23 +05:00
jani@ua126d19.elisa.omakaista.fi
3542dad33f Merge jani@192.168.0.2:/my/mysql-4.0
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2003-05-26 15:50:05 +03:00
monty@narttu.mysql.fi
48ecf0e8a7 Fixed core dump bug when shuting down mysqld 2003-05-26 13:10:08 +03:00
bar@bar.mysql.r18.ru
78c7d40986 BINARY collations for every character set 2003-05-23 18:39:55 +05:00
bar@bar.mysql.r18.ru
8192d169a2 CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
bar@bar.mysql.r18.ru
4b3c1364af charset.c:
Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations
2003-05-23 14:24:52 +05:00
bar@bar.mysql.r18.ru
2b1e1f6494 Variables were rename, binary collation names were added
Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled
2003-05-22 17:20:19 +05:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
bar@bar.mysql.r18.ru
8d52377a5c Some SHOW VARIABLES have been renamed:
collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server

SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
2003-05-21 17:44:12 +05:00
bar@bar.mysql.r18.ru
7f771ce2e1 "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
"character_set_system" has been added to display the system character set
2003-05-21 13:58:30 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
jani@hynda.(none)
c9d76b51cf Fixed a bug with having comments after options in config files.
Bug ID: 235
2003-05-14 16:47:55 +03:00
igor@rurik.mysql.com
a6c634b328 logging_ok:
Logging to logging@openlogging.org accepted
mf_keycache.c:
  Fixed a deadlock when reading from an index file fails.
2003-05-13 12:06:34 -07:00
monty@narttu.mysql.fi
13530887cb Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)
2003-05-13 18:58:26 +03:00
monty@mashka.mysql.fi
4bde719df7 Safety fix to enable RAID in max binaries
Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)
2003-05-13 10:54:07 +03:00
serg@serg.mylan
356b7f62fb count_bits() moved to mysys/ 2003-05-04 18:43:07 +02:00
serg@serg.mylan
f69b6e041c more #ifdef THREAD added 2003-04-30 12:32:43 +02:00
monty@mashka.mysql.fi
252ba8aa61 Better test for regular files. 2003-04-28 12:31:19 +03:00
greg@mysql.com
eda4590086 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-04-27 21:16:20 -04:00
greg@mysql.com
1d2507e875 Change to NetWare platform mods, per Monty 2003-04-27 21:15:52 -04:00
monty@mashka.mysql.fi
8b20a878cc Merge with 3.23:
Set innobase_flush_log_at_trx_commit to 1 by default
Fix problem with timestamp on 64 bit systems
Reserve alarms for up to 10 slave threads
2003-04-26 21:10:13 +03:00
monty@mashka.mysql.fi
f88097eee9 Fix possible memory overrun when reading broken character set files 2003-04-26 17:57:19 +03:00
greg@mysql.com
24968f1ee3 Changes from Novell for NetWare platform 2003-04-24 20:48:54 -04:00
lenz@mysql.com
9d11b35110 - Only ignore _regular_ world-writeable files (thanks to Tim Bunce for
discovering this)
2003-04-23 01:51:26 +02:00
hf@deer.mysql.r18.ru
73ae71a8eb Bugfix for segfault in mysql with embedded library 2003-04-16 14:49:46 +05:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
8f957e6ab5 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-04-03 13:08:28 +03:00
monty@narttu.mysql.fi
e96c75fec0 Fixed bug in memory allocation that could affect 64 bit systems (affected hammer) 2003-04-03 13:07:42 +03:00
bar@bar.mysql.r18.ru
48bf81f62e charset2html.c:
It's now working under HTTPD as a CGI. Very convenient!
2003-04-01 17:26:28 +05:00
bar@bar.mysql.r18.ru
ca1a736296 mbcharlen() is now used instead of ismbhead(). The last one has been removed. 2003-04-01 15:52:09 +05: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
bar@bar.mysql.r18.ru
5b50426f8f Some optimization in CHARSET_INFO:
We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same.
2003-04-01 12:45:16 +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
bar@bar.mysql.r18.ru
74a7d23aab charset.c:
strcasecmp -> my_strcasecmp
  This fix compilation problem on windows
2003-03-28 19:37:25 +04:00
bar@bar.mysql.r18.ru
4e06f1f5bd German Phone book collation is always compiled
Some collation names have been renamed
2003-03-26 13:27:19 +04:00
bar@bar.mysql.r18.ru
0f7c02f5fa SHOW CHARACTER SET now can display comments
Low case letters are used in charset names
2003-03-25 16:12:49 +04:00
monty@narttu.mysql.fi
5f5c367361 Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's)
Changed keycache variables to start with my_ instead of _my_
2003-03-25 02:37:41 +02: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
bar@bar.mysql.r18.ru
6814c8d36a SELECT N'string' 2003-03-20 22:01:03 +04:00
monty@narttu.mysql.fi
9f200ede0d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-03-20 02:06:08 +02:00
monty@narttu.mysql.fi
48a9c1239c Added support for ULONG division with DIV
Fixed non fatal memory leak in slave code.
2003-03-19 21:23:13 +02:00
bar@bar.mysql.r18.ru
0137c812dc SHOW CREATE TABLE didn't display field names in the proper charset 2003-03-18 13:42:45 +04:00
bar@bar.mysql.r18.ru
04db86f22a 2003-03-17 21:56:34 +04:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +04:00
root@home.(none)
5c6c54c09a system_charset_info has been moved to /sql directory
and isn't used in libraries any longer
2003-03-16 12:30:10 +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
bar@bar.mysql.r18.ru
b009386fa4 Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00