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

347 commits

Author SHA1 Message Date
kent@kent-amd64.(none)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:04:59 +01:00
tomas@poseidon.
044c410968 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2006-12-27 11:01:54 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files: 
Changed header to GPL version 2 only
 2006-12-27 02:23:51 +01:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
jonas@perch.ndb.mysql.com
ca3d0cf5b0 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-07 15:25:40 +01:00
jonas@perch.ndb.mysql.com
3ab75d971d ndb - bug#21948 & bug#17605 
fix alloc/free extent in undo log
  allow extent to be reused once a lcp is finished (instead of when next lcp starts)
 2006-12-07 15:25:02 +01:00
jonas@perch.ndb.mysql.com
4456144c58 ndb - add support for periodic mem-reporting 2006-12-06 14:38:32 +01:00
jonas@perch.ndb.mysql.com
315a4e18c8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-05 22:45:17 +01:00
jonas@perch.ndb.mysql.com
d720cd2786 ndb - bug#24664 
1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
  2) fix >= and > bug in lcp skip/keep handling
  3) very cool test prog for this :-)
 2006-12-05 15:10:56 +01:00
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 21:12:13 +01:00
jonas@perch.ndb.mysql.com
32c67ca05f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-01 11:32:52 +01:00
jonas@perch.ndb.mysql.com
13c44a9197 ndb - bug#24717 
fixes to testprogram to test new impl. in 5.1
 2006-12-01 11:08:53 +01:00
jonas@perch.ndb.mysql.com
b20c6e69ad ndb - bug#24717 
5.1 version
  remove 5.0 version
  add general routing signal
  send tckeyref routed if needed...
 2006-12-01 09:37:17 +01:00
gni/root@ts3-168.ts.cn.tlan
24b1feea03 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
 2006-12-01 11:35:05 +08:00
mskold/marty@linux.site
d7e375680a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-30 15:31:20 +01:00
mskold/marty@mysql.com/linux.site
9169edf348 Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel 2006-11-30 13:30:59 +01:00
monty@mysql.com/narttu.mysql.fi
3a35c30027 Fixed compiler warnings (Mostly VC++): 
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs

Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
 2006-11-30 03:40:42 +02:00
monty@mysql.com/nosik.monty.fi
0e149b7170 Removed compiler warnings 
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
 2006-11-27 18:16:08 +02:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f Fixed a LOT of compiler warnings 
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
 2006-11-27 01:47:38 +02:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
stewart@willster.(none)
e07d563a4d Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
 2006-11-08 15:23:46 +11:00
stewart@willster.(none)
dd2cea1698 remove OSE 2006-11-03 02:18:45 +11:00
stewart@willster.(none)
be7baa4f75 BUG#22309 FileLogHandler::createNewFile() isn't thread safe - may loose log messages 
BUG#22305  	SysLogHandler not thread safe
BUG#22313  	can get duplicate log messages in cluster log

Fix all these problems with one patch. Make Logger, hence EventLogger (with a 
bit more) thread safe.
 2006-11-03 01:12:30 +11:00
stewart@willster.(none)
d345a1fdf7 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
 2006-11-02 23:46:59 +11:00
lzhou/root@dev3-138.dev.cn.tlan
b5e13ac17d Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
 2006-11-01 10:53:24 +00:00
knielsen@ymer.(none)
e43c5fca48 Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2006-10-25 10:44:22 +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
07c6a601ea ndb - 
Add better error message if getting error in RESTORE
 2006-10-20 14:36:39 +02:00
stewart@willster.(none)
1d70db173f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
 2006-10-18 22:23:14 +10:00
stewart@willster.(none)
71636edc16 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
 2006-10-18 18:51:39 +10:00
Justin.He/justin.he@qa3-104.qa.cn.tlan
0192e8ab20 add a new mgmapi ndb_mgm_get_db_parameter_info, which retrieve parameter's name 2006-10-18 11:06:35 +08:00
stewart@willster.(none)
975e2f37b9 BUG#21253 NdbApi.h should not include my_config.h 2006-10-16 17:01:01 +10:00
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:25:24 +02:00
stewart@willster.(none)
3551165c90 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb
 2006-10-05 23:13:29 +10:00
jonas@perch.ndb.mysql.com
0b5ad7f38b ndb - bug#17929 
guess which scan type to use in handler
 2006-10-05 14:25:18 +02:00
jonas@perch.ndb.mysql.com
c3e20d907e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-04 11:42:50 +02:00
knielsen@bk-internal.mysql.com
a96d7250e8 Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj 
into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb
 2006-10-04 11:33:28 +02:00
jonas@perch.ndb.mysql.com
b0b69bac4a Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-26 16:14:05 +02:00
pekka@orca.ndb.mysql.com
c9e53b3f11 ndb - bug#21690: cleanup: set column properties in any order before create 2006-09-26 14:21:52 +02:00
jonas@perch.ndb.mysql.com
e609add790 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-09-26 13:58:34 +02:00
mskold/marty@linux.site
5e60232da9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-22 21:14:58 +02:00
gni/root@dev3-127.(none)
493e5ddbfa Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-ndb-bj 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21585
 2006-09-22 20:28:12 +08:00
gni/root@dev3-127.(none)
c26952192b BUG@21585 The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm 
and other commands related to ndb. For all of these, the help screen contains 
           "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
 2006-09-22 20:22:50 +08:00
dli@dev3-76.dev.cn.tlan
2724451f83 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
 2006-09-20 10:25:31 +08:00
msvensson@shellback.(none)
f1e91ec7f7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 17:00:09 +02:00
jonas@perch.ndb.mysql.com
64bf33836e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-09-15 11:43:49 +02:00
knielsen@ymer.(none)
eac6374a88 Fix compilation errors in gcc -ansi -pedantic. 2006-09-07 21:00:00 +02:00
knielsen@ymer.(none)
273f189971 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-ndb-pbsu
 2006-09-07 15:25:59 +02:00
knielsen@ymer.(none)
f8f1b203e5 NDB temporary tables. 
Temporary tables are not written to disk by DDL operations. This makes
DDL much faster (useful for tests), but tables are lost after system
restart.

New commit, since this feature will not be available in 5.1.
 2006-09-07 15:09:34 +02:00