mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33277 commits 2781 branches 343 tags 1.6 GiB
Commit graph

33277 commits

This branch
This branch
All branches
Author SHA1 Message Date
stewart@willster.(none)
3c2eeb2c15 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
 2006-10-23 23:57:28 +10:00
stewart@willster.(none)
5926602aa7 Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables 
fixes for ndb_* tests broken by previous fix

be more careful in ndb about setting errors on failure of info call (especially
in open)
 2006-10-23 23:46:35 +10:00
stewart@willster.(none)
fc776db8e7 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
 2006-10-23 23:43:48 +10:00
andrey@example.com
6237be99d0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  example.com:/work/bug23037/my50
 2006-10-23 15:21:23 +02:00
msvensson@neptunus.(none)
6b5ec53962 Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows) 2006-10-23 13:32:20 +02:00
msvensson@neptunus.(none)
38c66b638f Netware uses size_t as socklen_t 2006-10-23 13:26:04 +02:00
andrey@example.com
389c6a019e Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" 
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
 2006-10-23 13:12:30 +02:00
msvensson@neptunus.(none)
377e21df50 When looking for libc the path need to be converted from wine to unix format before test that directory exists 2006-10-23 12:56:25 +02:00
pekka@orca.ndb.mysql.com
af27544fd6 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
 2006-10-23 12:55:53 +02:00
msvensson@neptunus.(none)
cad9d6b106 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-23 12:19:52 +02:00
msvensson@neptunus.(none)
e5c2351b4a Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-23 12:17:15 +02:00
msvensson@neptunus.(none)
43aa130a38 If "var" is a symlink which does not point to anything, remove it before creating real var 2006-10-23 12:16:40 +02:00
msvensson@neptunus.(none)
962fe84784 As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for 
their binaries in a separate function and produce test casea failures for the test thet needs these components
 2006-10-23 12:02:56 +02:00
kostja@bodhi.local
81962878d8 A post-merge fix. 2006-10-23 13:55:29 +04:00
msvensson@neptunus.(none)
2459dd55f5 Copy *.cnf file from std_data/ when doing a binary distribution 2006-10-23 10:56:13 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7ad7d6e324 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
 2006-10-23 13:25:24 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
1f65242652 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
 2006-10-23 13:18:56 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
dd2a1d1e96 Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
 2006-10-23 12:58:20 +05:00
kostja@bodhi.local
0ef2ae34e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-10-23 11:51:45 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a67472f289 Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
 2006-10-23 12:44:25 +05:00
gkodinov@dl145s.mysql.com
b1bd09cbfa Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-21 09:33:53 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5f12986d7d configure.in: 
Raised version number to 5.0.28
 2006-10-21 01:22:16 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f97fe50dbb Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-10-21 01:13:50 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
08d47a3b81 make_win_bin_dist: 
Copy udf examples and raid.h
  Create target "include" directory before copying files to it
CMakeLists.txt:
  Only compile in bdb if configured
configure.in:
  Raised version number to 5.0.27
 2006-10-21 00:57:08 +02:00
tsmith/tim@siva.hindu.god
1965238b82 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-20 16:02:48 -06:00
cmiller@zippy.cornsilk.net
482712bf83 Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-release 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-10-20 17:30:28 -04:00
cmiller@zippy.cornsilk.net
b96ab282ea Bug #23427: incompatible ABI change in 5.0.26? 
Revert 1 June change enough to restore ABI compatibility with previous
versions.
 2006-10-20 17:17:24 -04:00
tsmith/tim@siva.hindu.god
8998ecbc21 Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-20 13:28:47 -06:00
tsmith/tim@siva.hindu.god
deee020489 Apply InnoDB snapshot ss923 
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION
 2006-10-20 12:34:31 -06:00
anozdrin/alik@alik.
643606cac9 Instance Manager polishing. 2006-10-20 22:26:40 +04:00
msvensson@neptunus.(none)
125163c03b Init some variables that changes between test cases direclty in run_testcase 
This can not be done in run_testcase_start_servers as embedded never starts a server
Add error if mysqld_start is called in embedded mode
 2006-10-20 17:09:07 +02:00
jonas@perch.ndb.mysql.com
822e638d57 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-10-20 16:22:16 +02:00
jonas@perch.ndb.mysql.com
a03b282f17 ndb - bug#23499 and bug#23502 
Fix some too small buffers in backup
 2006-10-20 16:16:01 +02:00
dlenev@mockturtle.local
384f0fee0d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg15228-2
 2006-10-20 16:05:23 +04:00
dlenev@mockturtle.local
3fce634fc1 Fix for bug#15228 "'invalid access to non-static data member' 
warnings in sql_trigger.cc and sql_view.cc".

According to the current version of C++ standard offsetof() macro
can't be used for non-POD types. So warnings were emitted when we
tried to use this macro for TABLE_LIST and Table_triggers_list
classes. Note that despite of these warnings it was probably safe
thing to do.

This fix tries to circumvent this limitation by implementing
custom version of offsetof() macro to be used with these
classes. This hack should go away once we will refactor
File_parser class.

Alternative approaches such as disabling this warning for
sql_trigger.cc/sql_view.cc or for the whole server were
considered less explicit. Also I was unable to find a way
to disable particular warning for particular _part_ of
file in GCC.
 2006-10-20 15:47:52 +04:00
jonas@perch.ndb.mysql.com
ab4ec626e2 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-10-20 13:38:49 +02:00
jonas@perch.ndb.mysql.com
303d7f6bed ndb - 
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
 2006-10-20 13:38:15 +02:00
kaa@polly.local
8800905fca Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-20 14:49:35 +04:00
kaa@polly.local
fdbb0d2a00 Merge polly.local:/tmp/maint/bug23256/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-10-20 14:45:34 +04:00
kaa@polly.local
c06f64e814 Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-20 14:44:22 +04:00
kaa@polly.local
165e2f156c Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint 
into  polly.local:/tmp/maint/bug23256/mysql-5.0-maint
 2006-10-20 14:32:31 +04:00
jonas@perch.ndb.mysql.com
a93a4c7bdb Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-10-20 12:31:51 +02:00
kaa@polly.local
4d93069773 Fix for bug #23256 "doesn't build on alpha" 
- compilation on the Alpha platform was broken because the Alpha-specific code was not updated after replacing the SIGRETURN_FRAME_COUNT constant with a variable
 2006-10-20 14:31:47 +04:00
jonas@perch.ndb.mysql.com
88385d162a ndb - 
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
 2006-10-20 12:29:16 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0bbae9b3c5 Fix for bug #22723: Host field blank when server started with skip-grant 
We set 'host_or_ip' to "" in the Security_context::skip_grants().
 2006-10-20 15:08:25 +05:00
gkodinov@dl145s.mysql.com
4eff5ab26a Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-20 11:05:06 +02:00
gkodinov@dl145s.mysql.com
a93cc1b70b Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
0612a212d1 Merge bk-internal:/home/bk/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-10-20 10:57:38 +02:00
msvensson@neptunus.(none)
3426b59dbb Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 23:26:43 +02:00
msvensson@neptunus.(none)
13b9adbac3 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-19 23:13:32 +02:00