tomas@poseidon.ndb.mysql.com
b444c28e2a
bug#6684, error messages id wrong settings
2004-11-18 19:07:14 +00:00
tomas@poseidon.ndb.mysql.com
1ef2b36369
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-18 18:39:25 +00:00
tomas@poseidon.ndb.mysql.com
7ec0239162
changed mysqladmin.c to mysqladmin.cc
...
no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
enabled multiple management servrs to fetch data configurations from eachother
2004-11-18 18:38:38 +00:00
mskold@mysql.com
3a63cac113
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-18 18:21:20 +01:00
petr@mysql.com
ad2bd09d13
coding style fix
2004-11-18 19:06:02 +03:00
petr@mysql.com
3f180bcade
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
2004-11-18 18:57:54 +03:00
pekka@mysql.com
c273fda5ed
ndb: new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
2004-11-18 16:44:50 +01:00
lenz@mysql.com
40c5b91930
- added sql_trigger.cpp to the mysqld and libmysqld project files
2004-11-18 16:36:25 +01:00
marko@hundin.mysql.fi
766adf172b
row0ins.c:
...
row_ins_scan_sec_index_for_duplicate(),
row_ins_duplicate_error_in_clust():
remove unused variables "ptr"
2004-11-18 17:01:33 +02:00
mskold@mysql.com
7bbee8c95d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-18 15:55:18 +01:00
timour@mysql.com
5d1f920ba7
correct name of function in synopsis
2004-11-18 16:52:45 +02:00
petr@mysql.com
d067e9e90f
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
2004-11-18 16:49:13 +03:00
pekka@mysql.com
22973f11c7
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-11-18 13:39:47 +01:00
bar@mysql.com
fe3b359b74
Check that the third UNION part with COLLATE
...
clause resolves collation conflict for the
first and the second parts pair.
2004-11-18 16:15:48 +04:00
petr@mysql.com
30789e7aa2
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
2004-11-18 14:53:21 +03:00
mskold@mysql.com
a4d061a5d9
Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key ..
2004-11-18 12:11:56 +01:00
pekka@mysql.com
bc31325180
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-11-18 11:55:53 +01:00
pekka@mysql.com
b2b7bf0eaa
ndb: charset fix from Bar (strxfrm_multiply can be 0)
2004-11-18 11:48:21 +01:00
petr@mysql.com
890211a7c4
WL 2059 Engine-specific status variables framework and WL 1922
...
InnoDB status variables
2004-11-18 13:00:42 +03:00
timour@mysql.com
57bdbd4e78
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-grind
2004-11-18 11:24:51 +02:00
timour@mysql.com
0a11036e1c
Fixed one warning and two errors reported by VC 6.0.
2004-11-18 11:24:18 +02:00
gluh@gluh.mysql.r18.ru
a68a9fe268
remove unused parts of code
...
fix for 'show create schema_table'
fix for usage schema tables in subselect
'wrong schema table charset' fix
2004-11-18 12:16:06 +03:00
tomas@poseidon.ndb.mysql.com
15621600b3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-18 08:43:00 +00:00
tomas@poseidon.ndb.mysql.com
f2110823d5
ifdef'd unused table reorg code
2004-11-18 08:42:26 +00:00
serg@serg.mylan
c7532a698d
merged
2004-11-17 20:07:13 +01:00
serg@serg.mylan
e68bd85b77
merged
2004-11-17 18:04:36 +01:00
serg@serg.mylan
19067008b8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-17 17:54:15 +01:00
guilhem@mysql.com
f04832b52d
time independent test
2004-11-17 17:06:24 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2074aeecb8
Use negate_expression() instead of new Item_func_not()
2004-11-17 15:49:12 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b7b13be5e0
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/wl638.3
2004-11-17 15:49:11 +00:00
bell@sanja.is.com.ua
1675523e15
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-17 17:49:10 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
8c0d21d186
WL#638 - Fix precedence for parsing NOT ... LIKE expression s
...
Rework parser expression rules
Rework handling for "||" concat/or
Eliminate some shift/reduce conflicts
Add support for "xxx IS [ NOT ] truth_value"
2004-11-17 15:49:10 +00:00
gluh@gluh.mysql.r18.ru
505324c17a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1
2004-11-17 18:49:09 +03:00
gluh@gluh.mysql.r18.ru
a288f3b3e1
Fix for Auto_increment filed value in 'show table status'
...
code cleanup
2004-11-17 18:48:12 +03:00
guilhem@mysql.com
d34421c127
Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code.
...
Moving the part of user_var.test using UCS2 to ctype_ucs.test
2004-11-17 16:41:30 +01:00
bell@sanja.is.com.ua
8a2ca00222
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-17 16:58:08 +02:00
serg@serg.mylan
37e872de8c
merged
2004-11-17 15:28:37 +01:00
serg@serg.mylan
431b93609c
#warning removed
...
AC_FUNC_MMAP changes to AC_CHECK_FUNCS(mmap)
2004-11-17 14:38:01 +01:00
serg@serg.mylan
2d8c21f700
test for bug#5528
2004-11-17 13:38:35 +01:00
bell@sanja.is.com.ua
96c2c9b8cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-17 14:20:28 +02:00
bell@sanja.is.com.ua
f8edd9f9f1
fixing compiler warnings
2004-11-17 14:17:09 +02:00
serg@serg.mylan
a102fd5a2e
don't fail if dbug manual cannot be built
2004-11-17 12:28:44 +01:00
tomas@poseidon.ndb.mysql.com
2c677ed687
Merge
2004-11-17 10:59:16 +00:00
konstantin@mysql.com
ed2674d0a7
Fix warnings and compilation failures (Windows).
2004-11-17 13:45:05 +03:00
tomas@poseidon.ndb.mysql.com
1700bf3844
Enabled usage of new system variables for ndb
...
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
2004-11-17 08:15:53 +00:00
tomas@poseidon.ndb.mysql.com
0acc6f83b2
enabled having system tables in ndb
2004-11-17 08:10:26 +00:00
igor@rurik.mysql.com
078597564d
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2004-11-16 15:07:49 -08:00
petr@mysql.com
0fa5496a18
portability fix
2004-11-17 01:52:33 +03:00
sergefp@mysql.com
bfd6c218b2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
2004-11-17 01:26:23 +03:00
igor@rurik.mysql.com
e17073c4a2
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-11-16 14:01:40 -08:00