mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51047 commits 2785 branches 343 tags 1.6 GiB
Commit graph

2063 commits

Author SHA1 Message Date
svoj@june.mysql.com
162d70cb02 Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.1-engines
 2007-11-12 15:26:37 +04:00
svoj@june.mysql.com
5e44309422 Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
 2007-11-12 15:16:00 +04:00
svoj@mysql.com/june.mysql.com
a6def1f4ab Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0 
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
 2007-11-12 15:02:42 +04:00
svoj@mysql.com/june.mysql.com
d06e2f9223 BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE 
RENAME TABLE against a table with DATA/INDEX DIRECTORY overwrites
the file to which the symlink points.

This is security issue, because it is possible to create a table with
some name in some non-system database and set DATA/INDEX DIRECTORY
to mysql system database. Renaming this table to one of mysql system
tables (e.g. user, host) would overwrite the system table.

Return an error when the file to which the symlink points exist.
 2007-11-06 18:09:33 +04:00
svoj@june.mysql.com
9f1d9beffa Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
 2007-10-24 16:39:13 +05:00
svoj@mysql.com/june.mysql.com
5d1ccce58a BUG#31159 - fulltext search on ucs2 column crashes server 
ucs2 doesn't provide required by fulltext ctype array. Crash
happens because fulltext attempts to use unitialized ctype
array.

Fixed by converting ucs2 fields to compatible utf8 analogue.
 2007-10-24 16:09:30 +05:00
antony@pcg5ppc.xiphis.org
3b95727600 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
 2007-10-19 13:06:37 -07:00
malff@lambda.hsd1.co.comcast.net.
2d6fbbda59 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
 2007-10-18 16:57:51 -06:00
malff@lambda.hsd1.co.comcast.net.
6fa35a5d3b Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
 2007-10-18 16:39:55 -06:00
tsmith@ramayana.hindu.god
06c6fce750 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:15:09 -06:00
tsmith@ramayana.hindu.god
070dc3ffb5 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-10-10 14:12:36 -06:00
istruewing@stella.local
0ab9d3718d Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-10-10 21:25:19 +02:00
davi@moksha.local
efdd32ced3 Merge moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime 
into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
 2007-10-09 09:48:49 -03:00
kostja@bodhi.(none)
7ec30183bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-10-08 02:05:55 +04:00
tsmith@sita.local
d1c559d8a0 Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-10-04 13:51:27 -06:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
3060f0be8e Bug#31382 
"Disabled plugin is provoking Valgrind error"
  If there are any auto-alloced string plug-in options, memory is
  allocated during the call for handle_options(). We must free this
  memory if we are not installing the plug-in.
 2007-10-04 10:55:08 -07:00
kaa@polly.(none)
84659e2de1 Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-04 13:38:58 +04:00
kaa@polly.(none)
bd885daa4f Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-04 13:29:37 +04:00
kaa@polly.(none)
8f204ea029 Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731 
into  polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
 2007-10-04 13:07:11 +04:00
kaa@polly.(none)
1ba3f4f56b Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable. 
This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.
 2007-10-04 12:34:00 +04:00
msvensson@pilot.mysql.com
18c6118911 Bug#30992 Wrong implementation of pthread_mutex_trylock() 
It's not possible to use WaitForSingleObject to wait
on a CRITICAL_SECTION, instead use the TryEnterCriticalSection function.
 - if "mutex" was already taken => return EBUSY
 - if "mutex" was aquired => return 0
 2007-10-03 21:38:32 +02:00
msvensson@pilot.mysql.com
e4d7e21683 Bug#27597 mysqld-debug broken 
- "on" -> "restore" to avoid warning in MSVC when compiling with debug
 2007-10-02 20:44:37 +02:00
kaa@polly.(none)
cfb88e652d Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_keycache 
into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
 2007-10-02 11:14:19 +04:00
mats@kindahl-laptop.dnsalias.net
23622616ab Merge kindahl-laptop.dnsalias.net:/home/bk/b30992-mysql-5.0-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b30992-mysql-5.0-runtime
 2007-10-01 15:14:58 +02:00
mats@kindahl-laptop.dnsalias.net
5dad55cd24 BUG#30992 (Wrong implementation of pthread_mutex_trylock()): 
Adding support for correct handling of pthread_mutex_trylock() on Win32
systems as well as when using the safe mutexes.
 2007-10-01 15:11:15 +02:00
df@pippilotta.erinye.com
59f9885bb4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vista 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-09-27 09:42:54 +02:00
df@pippilotta.erinye.com
14e602e9e4 avoid using GetTempFileName in a way it's documented to not work on windows 2007-09-27 08:56:06 +02:00
kaa@polly.local
ab0373e78a Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0. This is for bug #5731. 2007-08-29 20:45:04 +04:00
kaa@polly.local
39e53b4fee Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms. 
This is required to allow key_buffer_size > 4 GB (bug #5731).
 2007-08-29 19:20:18 +04:00
gkodinov/kgeorge@magare.gmz
e3450ecff2 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28284-5.1-opt
 2007-08-28 12:22:55 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
b7231ad5d9 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-25 12:08:18 +03:00
gkodinov/kgeorge@magare.gmz
63d18a6057 Bug #28284: Test "mysqlslap" reports "out of memory" 
When locking a "fast" mutex a static variable cpu_count 
was used as a flag to initialize itself on the first usage 
by calling sysconf() and setting non-zero value.
This is not thread and optimization safe on some 
platforms. That's why the global initialization needs 
to be done once in a designated function.
This will also speed up the usage (by a small bit) 
because it won't have to check if it's initialized on
every call.

Fixed by moving the fast mutexes initialization out of 
my_pthread_fastmutex_lock() to fastmutex_global_init()
and call it from my_init()
 2007-08-24 18:06:44 +03:00
joerg@trift2.
d4d4f8528e Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
jani@hynda.mysql.fi
6519de0469 Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-22 17:29:38 +03:00
joerg@trift2.
20ce606797 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1

Includes manual merges.
 2007-08-22 16:08:55 +02:00
joerg@trift2.
ab7e096b68 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-21 18:42:35 +02:00
jani@hynda.mysql.fi
f8db7bac5b Merge hynda.mysql.fi:/home/my/mysql-5.0-marvel 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-21 19:09:46 +03:00
jani@hynda.mysql.fi
2fd7a743e4 Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-21 19:03:28 +03:00
malff/marcsql@weblab.(none)
1c27dd1d67 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-08-20 11:13:31 -06:00
jbruehe/mysqldev@mysql.com/production.mysql.com
2d4efab366 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/data0/mysqldev/my/mysql-5.1-30367
 2007-08-16 18:21:47 +02:00
jani@hynda.mysql.fi
c31c8fc93d Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail" 2007-08-16 17:25:48 +03:00
kostja@bodhi.(none)
91fe15bb9d Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
joerg@trift2.
1d3f1985e4 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-15 12:52:47 +02:00
monty@narttu.mysql.fi
9d609a59fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-08-14 00:22:34 +03:00
tsmith@ramayana.hindu.god
541203b360 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-13 12:46:35 -06:00
monty@mysql.com/nosik.monty.fi
e53a73e26c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db

I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read()      -> index_read_map()
index_read_idx()  -> index_read_idx_map()
index_read_last() -> index_read_last_map()
 2007-08-13 16:11:25 +03:00
joerg@trift2.
3aa40ffa6f mysys/my_gethwaddr.c 
Fix a typing error in a conditional compiling directive
    (reported by Vasil Dimov: Thanks !),
    and improve their nesting ("MAIN" independent of platform).
 2007-08-09 14:56:57 +02:00
cmiller@zippy.cornsilk.net
867ae4ccc4 Correct bad merge, and remove version numbers from test case. 2007-08-08 12:21:04 -04:00
kostja@bodhi.(none)
28f1f1828d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-08 11:36:55 +04:00
kostja@bodhi.(none)
3c6eb0002d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-08-08 11:34:35 +04:00