mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22943 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1177 commits

Author SHA1 Message Date
bar@mysql.com
396bbdbee5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2005-03-29 14:49:33 +05:00
bar@mysql.com
2d1e9862bc Adding Cybozu's patch. 
Not active by default.
One need to pass -DHAVE_CYBOZU_COLLATION to 
activate it.
 2005-03-29 14:48:47 +05:00
petr@mysql.com
28a02c9bd0 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/cps/mysql/trees/mysql-4.1
 2005-03-29 11:58:34 +04:00
konstantin@mysql.com
eeeedd31b9 Manual merge 2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3 A fix for Bug#8226 "Cannot connect via shared memory": 
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts. 
Post review fixes.
 2005-03-26 01:21:52 +03: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
serg@serg.mylan
f4d4df2ca4 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-21 13:43:25 +01:00
dlenev@mysql.com
ea8adbff36 Manual merge of csets from -build tree into main 5.0 tree. 2005-03-21 11:39:47 +03:00
jimw@mysql.com
ee2b4ec959 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
 2005-03-18 16:12:25 -08:00
serg@serg.mylan
6ab6dc2d1f Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-17 18:37:13 +01:00
serg@serg.mylan
376a4ee03b Field::quote_data(): 
don't call escape_string_for_mysql() unnecesary
  don't overwrite local buffer
escape_string_for_mysql():
  take a length of the destination buffer as an argument
 2005-03-17 12:27:45 +01:00
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08: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
serg@serg.mylan
79573a5ee8 after merge fixes 2005-03-09 19:22:30 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
joerg@mysql.com
b2c4d73997 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-03-08 17:35:53 +01:00
joerg@mysql.com
3bbc35ac01 Merge changes. 2005-03-08 17:24:07 +01:00
jani@ua141d10.elisa.omakaista.fi
8db4423b8c Fixed Bug#8922. 
Reverted Jim's patch.
 2005-03-08 18:12:12 +02:00
jimw@mysql.com
d22a4e70f9 Clean up merge 2005-03-07 13:26:27 -08:00
serg@serg.mylan
d6fa7288c8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-07 14:28:10 +01:00
joerg@mysql.com
792d401981 Merge 4.0.24 compile changes into the 4.1 tree. 2005-03-07 10:28:56 +01:00
joerg@mysql.com
c45cfb7c07 Manual merge of the 4.0.24 compile changes into the 4.1 tree. 2005-03-07 10:27:20 +01:00
serg@serg.mylan
2b447eceb1 myisam/ft_parser.c 
protection against invalid string in ft_get_word
mysys/my_symlink2.c
    typo fixed
 2005-03-06 12:31:40 +01:00
joerg@mysql.com
4e136e8d1a Please the Sun C compiler by qualifying 'inline' as 'static inline'. 2005-03-04 12:31:30 +01:00
ingo@mysql.com
212388bd3c Merge with after merge fix 2005-03-04 11:37:45 +01:00
joerg@mysql.com
6ccbe89d52 Qualify 'inline' functions as 'static inline' to please the Sun C compiler. 2005-03-04 11:26:08 +01:00
serg@serg.mylan
f2c414e024 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-04 00:05:52 +01:00
jimw@mysql.com
f7c01cfb76 Merged from 4.1 2005-03-03 15:01:46 -08:00
serg@serg.mylan
e47d0a0e2d merge 2005-03-03 23:07:20 +01:00
serg@serg.mylan
45641ff65c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-03-03 21:13:57 +01:00
serg@serg.mylan
8d9a53a78c Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it) 2005-03-03 19:51:29 +01:00
jimw@mysql.com
9df04058fe Merge mysql.com:/home/jimw/my/mysql-4.1-8707 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-03-03 10:50:18 -08:00
jimw@mysql.com
2ca5cec8c2 Avoid calls to my_seek() and my_tell() on log files so that 
non-seekable files like FIFOs can be used for logs other
than the binlog. (Bug #8271)
 2005-03-02 18:14:58 -08:00
serg@serg.mylan
60e1c869f5 workaround for a bug removed 2005-03-02 15:29:46 +01:00
reggie@mdk10.(none)
1c45844a22 my_mmap.c: 
Changed #warning pragma at the bottom to only occur when being used on non-Windows OS
 2005-03-01 05:54:48 -06:00
petr@mysql.com
dfba6f4e9b Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/im-fix-review
 2005-03-01 01:59:37 +03:00
petr@mysql.com
053f2fcb7d fix compilation failure on sunfire280 2005-03-01 01:38:04 +03:00
monty@mysql.com
3839e443a4 merge with 4.1 2005-02-28 12:18:39 +02:00
monty@mysql.com
253bfcf783 Fixed wrong memory references found by purify 
(No really critical errors found, but a few possible wrong results)
 2005-02-28 11:59:46 +02:00
petr@mysql.com
c193b3281d Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/im-fix-review
 2005-02-27 18:53:11 +03:00
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
ramil@mysql.com
4ab10bcedf merge 2005-02-25 16:34:17 +04:00
monty@mysql.com
cd78e701a5 Show all generated warnings in SHOW ERROR 
Previously we only stored the first given error (the error sent to the client)
 2005-02-24 23:33:42 +02:00
reggie@mdk10.(none)
2ffd3a3a61 Changes to allow 5.0.3 to compile on Windows after XA was pushed 
logging_ok:
  Logging to logging@openlogging.org accepted
mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
  Changed how no mmap message is printed for Windows
sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
 2005-02-23 16:29:03 -06:00
jimw@mysql.com
3ecabaa9f7 Don't try to create a symlink if the DATA DIRECTORY specified for a table 
is the same as the normal datadir for that database. (Bug #8707)
 2005-02-23 13:59:04 -08:00
bar@mysql.com
a88af6c1dd Merge 2005-02-23 17:03:34 +04:00
monty@mysql.com
e2ea35ec67 Merge with 4.1 2005-02-22 15:47:00 +02:00
bar@mysql.com
5ef265f219 Bug#8349 myisamchk: --set-charset does not work 
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
 2005-02-22 16:37:25 +04:00
bar@mysql.com
c0230f6f5f ctype_latin1.result, ctype_latin1.test, charset.c: 
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
 2005-02-22 09:56:07 +04:00
petr@mysql.com
1e6bfa39c3 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/im-fix-review
 2005-02-20 23:01:07 +03:00
serg@serg.mylan
1bc6ae8913 portability fixes 2005-02-20 20:08:33 +01:00
petr@mysql.com
451de5dbfb merge 2005-02-19 02:22:05 +03:00
petr@mysql.com
dbc0937dd0 made IM to work with --defaults-file smoothly 2005-02-18 14:58:30 +03:00
serg@serg.mylan
c0dda01f76 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2005-02-18 12:02:46 +01:00
bar@mysql.com
dcb0f52e9a Merge: don't add this into configure in as it is already in 
config/ac-macros/character_sets.m4
 2005-02-18 13:21:30 +04:00
bar@mysql.com
c926e43f65 A way not to compile UCA collations 2005-02-18 12:58:16 +04:00
jimw@mysql.com
7eb8c130f7 Merge 2005-02-17 16:16:58 -08:00
jimw@mysql.com
e2291bdc7e Only escape the first character in a sequence of bytes that appears to be 
a multibyte character, but was not a valid multibyte character. Refinement
of fix for Bug #8378.
 2005-02-15 11:31:01 -08:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
monty@mysql.com
a1a39fab84 Merge with 4.1 2005-02-10 02:27:37 +02:00
jimw@mysql.com
5bb39302ab When escaping a string in a multi-byte character set, escape all bytes of 
a character that appears to be a multi-byte character based on its first
byte, but is not actually a valid multi-byte character. (Bug #8378)
 2005-02-09 16:14:13 -08:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
monty@mysql.com
80b3e02462 Fixed bug detected by sp-tests 
Cleanup during reviews of new pushed code
 2005-02-05 16:05:46 +02:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
monty@mysql.com
b87e0c52a7 Proper fix for comparision with ' ' 
(Bug #7788 "Table is full" occurs during a multitable update")
 2005-02-01 16:27:08 +02:00
Sinisa@sinisa.nasamreza.org
14d887c423 Merge sinisa.nasamreza.org:/mnt/work/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/petica
 2005-01-29 23:00:17 +02:00
Sinisa@sinisa.nasamreza.org
d8f467cfe8 Fix for a "table is full" bug in multi-table updates (Bug #7788) 2005-01-29 22:56:00 +02:00
ram@gw.mysql.r18.ru
c38886b20c timed_mutexes moved to include/my_sys.h and mysys/my_static.c 
to avoid linking problems referring to the variable from .c programs.
 2005-01-26 18:37:49 +04:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
serg@serg.mylan
1ca9d6497b remove the entry from the list, before freeing 2005-01-24 18:38:46 +01:00
serg@serg.mylan
24468e48f3 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-24 18:06:01 +01:00
serg@serg.mylan
79240013b2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
timour@mysql.com
36f1e91b69 Merge of fix for BUG#4258 from 4.1. 
Needs additional manual merge.
 2005-01-21 17:38:36 +02:00
timour@mysql.com
7fb0de20f3 Final patch for BUG#4285. 
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
 2005-01-19 12:55:54 +02:00
serg@serg.mylan
e029511720 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-18 11:26:38 +01:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
monty@mysql.com
e5b788146a Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
serg@serg.mylan
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
a37e91e435 Changed interface for my_strntod() to make it more general and more portable 2005-01-15 12:28:38 +02:00
monty@mysql.com
7681e62422 Merge 2005-01-15 03:49:07 +02:00
monty@mysql.com
6d280ac161 Fixed possible access to unintialized memory in filesort when using many buffers 2005-01-15 03:47:06 +02:00
monty@mysql.com
de4ec3ed30 Fix accesses to uninitialized memory (found by valgrind) 2005-01-13 03:02:49 +02:00
serg@serg.mylan
39b69a3cc9 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-12 21:11:55 +01:00
hf@deer.(none)
dba173c46b Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-01-12 20:05:32 +04:00
hf@deer.(none)
c64897dbe8 --defaults-extra-file bug fixed 2005-01-12 19:57:26 +04:00
shuichi@mysql.com
852d74a68e renamed charset name 'eucjp_ms' to 'eucjpms' 2005-01-12 02:58:15 -08:00
shuichi@mysql.com
3126e82291 added new character set - cp932, eucjp_ms 2005-01-11 17:45:36 -08:00
serg@serg.mylan
f7dc7064b8 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-11 22:34:10 +01:00
hf@deer.(none)
6f511796fc Merging fixed 2005-01-11 23:28:56 +04: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
serg@serg.mylan
652a4694fa Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-11 16:12:33 +01:00
konstantin@mysql.com
a0bc131743 Merge mysql.com:/home/kostja/work/mysql-4.1-7428 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-01-11 14:47:12 +03:00
konstantin@mysql.com
067d13f632 A fix for linking failure of MySQL client when linking with imap libraries 
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
 2005-01-11 13:53:10 +03:00
serg@serg.mylan
04c617f25e my_close(), my_sync(): retry if EINTR 2005-01-11 00:14:46 +01:00
serg@sergbook.mysql.com
a609bc45f2 merge 2005-01-07 15:02:25 +02:00
guilhem@mysql.com
1f6c72ccf1 Merge mysql.com:/home/mysql_src/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-06 21:31:47 +01:00
guilhem@mysql.com
4b2d003bf1 Fix for BUG#7714 "if disk full, sometimes MyISAM doesn't wait for free space, corrupts table" 
This happened only if my_write() couldn't write even one byte.
I cannot easily add a .test for this, but I tested by hand before and after the change.
 2005-01-06 21:30:39 +01:00