mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39977 commits 2778 branches 343 tags 1.6 GiB
Commit graph

39977 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
kostja@bodhi.local
2fecf79536 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-10-23 12:35:56 +04: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@myoffice.izhnet.ru
6cb5224279 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
 2006-10-23 13:18:52 +05:00
kostja@bodhi.local
4cb57ac048 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-10-23 12:06:59 +04:00
msvensson@neptunus.(none)
4fbdbf1a4c Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-23 15:59:00 +08: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
jonas@perch.ndb.mysql.com
cfd146d911 5.1.12 - release clone 
ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
 2006-10-23 09:48:36 +02: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
ramil/ram@myoffice.izhnet.ru
d4c7b6da83 Merge mysql.com:/usr/home/ram/work/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
 2006-10-23 12:07:48 +05:00
ramil/ram@myoffice.izhnet.ru
800d80542f Merge mysql.com:/usr/home/ram/work/bug20732/my50-bug20732 
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
 2006-10-23 10:32:39 +05:00
jonas@perch.ndb.mysql.com
79d8773e31 ndb - 
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
 2006-10-22 08:24:31 +02: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
cmiller@zippy.cornsilk.net
dae79f0a50 Fix bad merge. 2006-10-20 22:21:05 -04: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
tsmith/tim@siva.hindu.god
5a217c51dc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-20 15:56:59 -06:00
cmiller@zippy.cornsilk.net
5a39b2732c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-afterbreak 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-20 17:49:38 -04:00
cmiller@zippy.cornsilk.net
c2119709c6 Fix bad merge from #14262. 2006-10-20 17:44:03 -04: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
d5d1404d4b Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-20 13:53:39 -06:00
tsmith/tim@siva.hindu.god
09e094850b Applied InnoDB snapshot 5.1-ss927 
Fixes:
- Bug #23368: crash during insert, table has foreign key pointing into other schema,permission
 2006-10-20 13:44:49 -06:00
tsmith/tim@siva.hindu.god
07db2bc7e5 Merge siva.hindu.god:/usr/home/tim/m/bk/inno/51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-20 13:31:12 -06: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
c965f53784 Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50 
into  siva.hindu.god:/usr/home/tim/m/bk/inno/51
 2006-10-20 12:44:12 -06:00
tsmith/tim@siva.hindu.god
032f356f7c Apply InnoDB snapshot ss923 
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION
 2006-10-20 12:36:15 -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
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
60104e1132 make_win_bin_dist: 
Aligned script with updated 5.0 version
 2006-10-20 20:18:44 +02: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
bcb92268e7 merge 2006-10-20 16:26:40 +02:00
jonas@perch.ndb.mysql.com
c2dcd9a9f0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-20 16:25:14 +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
jonas@perch.ndb.mysql.com
ff05ba5131 ndb - bug#23494 
Fix bug in restore with table with many columns, Compute size of databuffer pool correctly
 2006-10-20 14:37:34 +02:00
jonas@perch.ndb.mysql.com
07c6a601ea ndb - 
Add better error message if getting error in RESTORE
 2006-10-20 14:36:39 +02:00
jonas@perch.ndb.mysql.com
11b4ac4733 ndb - bug#22838 
when doing create unique index which mysql will silently converts to PK, ndb is not informed
    so table will be useless.
  
    change so that we never do online add index wo/ primary key.
    this is not good, but it's better than a useless table
 2006-10-20 14:35:59 +02:00
jonas@perch.ndb.mysql.com
6980a0090f merge 2006-10-20 14:35:22 +02:00
jonas@perch.ndb.mysql.com
4218eb0fde Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-20 14:31:39 +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
850688194b Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg15228-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg15228
 2006-10-20 15:54:58 +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