lzhou/zhl@dev3-63.(none)
3452327223
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30134
2007-08-15 16:38:27 +00:00
gni/root@dev3-221.dev.cn.tlan
a60888f169
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug27683
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug27683
2007-08-08 18:23:32 +08:00
lzhou/zhl@dev3-63.(none)
463bb1fdb4
BUG#30134 restore of backup from different endian can work for timestamp column
2007-07-31 15:09:16 +00:00
tomas@whalegate.ndb.mysql.com
b2aa8dd4d3
Bug #29103 ndb_restore segfaults on NULL var[char|binary]
2007-06-14 12:51:13 +02:00
stewart@flamingspork.com[stewart]
155390c3a7
[PATCH] BUG#29074 preserve file timestamps in ndb_error_reporter
...
Index: ndb-work/storage/ndb/tools/ndb_error_reporter
===================================================================
2007-06-13 23:34:36 +10:00
tomas@poseidon.mysql.com
8fd5212a9f
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-05 18:00:42 +02:00
tomas@poseidon.mysql.com
47d5fb91d2
Bug #28751 Lots of memory locked in memory causes high kswapd
...
- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
2007-06-05 17:29:50 +02:00
gni@dev3-221.dev.cn.tlan
305d0eaf02
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2007-05-08 09:52:27 +08:00
tomas@whalegate.ndb.mysql.com
598a60285f
ndb_restore to set correct value force varpart
...
+ some tests
2007-04-30 11:43:50 +02:00
stewart@willster.(none)
14ff88741c
Bug #24228 ndb_size.pl requires non-standard HTML::Template module
...
Bug #24227 ndb_size.pl should report default values instead of < default for config params
Bug #24229 ndb_size.pl doesn't compute Index usage correctly
Big ndb_size.pl update
2007-04-24 13:43:13 -07:00
gni@dev3-221.dev.cn.tlan
40060d2f2e
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
2007-04-24 17:29:00 +08:00
gni@dev3-221.dev.cn.tlan
4648c56769
BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. With --no-upgrade (-u) option, user can decide if ignore the upgrade, the default action is to upgrade them.
2007-04-24 09:45:15 +08:00
tomas@whalegate.ndb.mysql.com
ac8d2dead6
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-13 01:45:44 +02:00
tomas@whalegate.ndb.mysql.com
2e620e3db6
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-12 11:12:43 +02:00
tomas@whalegate.ndb.mysql.com
6ec3cd9836
set name for ndb tools
2007-04-04 14:46:09 +02:00
tomas@poseidon.mysql.com
e1cd5c67dc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-21 16:34:23 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4
enabled test case
...
+ some fixes to do the enable
2007-03-20 17:07:53 +01:00
tomas@whalegate.ndb.mysql.com
64b9bda21f
BUG#24363 If the table structure has been changed, the default action about the restore will fail.
...
- correction of patch, original patch will segfault for print option
2007-03-20 11:11:08 +01:00
tomas@poseidon.
12fd06a6cb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2007-03-19 10:54:47 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8b049838bf
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb.test
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.test
2007-03-13 18:18:17 +08:00
tomas@poseidon.mysql.com
87b8cf843e
Merge poseidon.mysql.com:/home/tomas/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-09 18:18:52 +07:00
tomas@poseidon.mysql.com
7e32a4b86b
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 18:10:55 +07:00
jonas@perch.ndb.mysql.com
5a6952b8c5
Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca
2007-03-09 11:50:32 +01:00
tomas@poseidon.mysql.com
f4e0bc78dd
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-09 01:01:20 +07:00
tomas@poseidon.mysql.com
12bf7fbee5
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
2007-03-08 10:41:22 +07:00
tomas@poseidon.mysql.com
f81ff454f0
new apply_status table test adoption
...
new apply_status table ndb_restore adoption
2007-03-08 08:22:27 +07:00
tomas@poseidon.mysql.com
97ceb61fff
corrected manual merge
2007-03-07 14:20:37 +07:00
tomas@poseidon.mysql.com
bd49cdd273
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
2007-03-07 13:44:54 +07:00
tomas@poseidon.mysql.com
05afa6e689
Merge poseidon.mysql.com:/home/tomas/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-07 00:31:12 +07:00
tomas@poseidon.mysql.com
28947771d7
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-01 11:15:42 +07:00
tomas@poseidon.mysql.com
3838925f04
Bug #26741 ndb_restore with only print_data seg faults
...
- only creat systable if conencted to ndb
2007-03-01 11:07:24 +07:00
tomas@poseidon.mysql.com
3c1af79c61
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-01 08:45:26 +07:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9
Fixed compiler warnings
...
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.
Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.
Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
2007-02-23 13:13:55 +02:00
pekka@clam.ndb.mysql.com/clam.(none)
f668fabb61
ndb - 5.1.16 uint64 align for ndb_restore
2007-02-23 04:21:39 +01:00
gni/root@dev3-221.dev.cn.tlan
d2a0c95aef
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2007-02-15 16:27:21 +08:00
gni/root@dev3-221.dev.cn.tlan
525801e31b
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug24363
2007-02-15 13:44:01 +08:00
tomas@poseidon.mysql.com
18f63370aa
Bug #24000 ndb_config.cpp has the wrong name ndb_condig.cpp in source distro
2007-02-08 13:40:05 +07:00
gni/root@dev3-221.dev.cn.tlan
53f7d72a5b
BUG#24363 If the table structure has been changed, the default action about the restore will fail.
...
You can skip the table structure check with --skip-table-check (-s) option.
2007-02-05 16:48:08 +08:00
monty@mysql.com/narttu.mysql.fi
1f6d91c5a6
after merge fixes
...
Removed
2007-01-29 16:13:18 +02:00
monty@narttu.mysql.fi
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
kent@kent-amd64.(none)
58763e383e
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +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
msvensson@neptunus.(none)
90226bbc33
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-05 19:19:58 +01:00
mskold/marty@linux.site
93b7491421
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 16:37:13 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +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
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
monty@nosik.monty.fi
38a92caeb7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00