kostja@bodhi.local
93d0316f45
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-04-03 14:34:37 +04:00
tomas@whalegate.ndb.mysql.com
3129179178
Bug #27378 update becomes delete on slave
...
- quick workaround, better patch is needed later
- test case
2007-03-29 14:14:42 +02:00
kostja@bodhi.local
b42b416400
Remove unnecessary casts to uchar. The casts are stemming from
...
the lexer API which internally uses unsigned char variables to
address its state map. The implementation of the lexer should be
internal to the lexer, and not influence the rest of the code.
2007-03-27 21:09:56 +04:00
tomas@whalegate.ndb.mysql.com
71ec671d4d
correction of manual merge
2007-03-26 21:10:34 +02:00
tomas@whalegate.ndb.mysql.com
d4982247cf
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 20:57:10 +02:00
tomas@whalegate.ndb.mysql.com
c445baeabd
correct medium int printout
...
correct cit printout
correct bit store retrieve
2007-03-26 17:57:00 +02:00
tomas@whalegate.ndb.mysql.com
405fb2cfb6
Bug #26986 BIT(33) for ndb is broken on solaris.
...
- always store lsw first in ndb
2007-03-26 14:48:52 +02:00
tomas@whalegate.ndb.mysql.com
df278bd605
BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table
2007-03-23 17:12:06 +01:00
tomas@whalegate.ndb.mysql.com
fcbdc84ade
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-22 12:55:32 +01:00
tomas@whalegate.ndb.mysql.com
cb4d64ad6c
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-22 12:55:08 +01:00
tomas@whalegate.ndb.mysql.com
8791870d63
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-22 12:47:20 +01:00
tomas@whalegate.ndb.mysql.com
a449d1de33
Bug #27320 ndb handler does not reset extra flags on reset()
...
- make sure all extra flags are reset
2007-03-22 12:42:13 +01:00
tomas@whalegate.ndb.mysql.com
ca118237bb
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-21 09:26:05 +01:00
tomas@whalegate.ndb.mysql.com
585782e084
Bug #26825 MySQL Server Crashes in high load
...
- initialize to NULL, to avoid call of free on uninitialized variable
2007-03-21 09:23:49 +01:00
tomas@whalegate.ndb.mysql.com
ba74604c56
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-21 09:08:05 +01:00
tomas@whalegate.ndb.mysql.com
37b8c96197
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-21 09:00:38 +01:00
tomas@whalegate.ndb.mysql.com
5682efdfcf
Bug #26825 MySQL Server Crashes in high load
...
- initialize to NULL, to avoid call of free on uninitialized variable
2007-03-21 08:40:24 +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
9b90dd9c9f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-19 12:31:33 +01:00
serg@janus.mylan
f813272125
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-16 14:09:30 +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
Justin.He/justin.he@dev3-240.dev.cn.tlan
2af8906b31
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25877-5.1-new-ndb-bj
2007-03-13 18:13:07 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c32b4084ec
BUG#25880, Adding new column to ndb_dd table moves data for non_indexed fields in memory
...
correct the inconsistency between columns' storage type with table's storage_media & tablespace
2007-03-13 18:13:06 +08:00
tomas@poseidon.mysql.com
175a7e9e86
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 20:44:44 +07:00
tomas@poseidon.mysql.com
a8cd78dd05
Bug #26825 MySQL Server Crashes in high load
...
Bug #26997 mysqld segfault when in single user mode
2007-03-09 20:29:46 +07:00
serg@janus.mylan
6aa5c001c5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-06 13:44:57 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0bdb2a0c06
BUG#25877, After DROP INDEX non-indexed data isn't moved from memory into tablespace
2007-03-05 19:14:56 +08:00
malff/marcsql@weblab.(none)
dc98aa82ab
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-02-28 18:14:56 -07:00
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb
Fixed compiler warnings.
2007-02-28 22:23:35 +02:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3
Remove compiler warnings
2007-02-27 19:31:49 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
6163508f85
Fixes for compiler warnings.
2007-02-27 11:27:04 +02:00
tomas@poseidon.mysql.com
9f586e3e61
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-02-26 23:50:02 +07:00
serg@janus.mylan
30321673a2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-26 16:12:40 +01: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
monty@mysql.com/narttu.mysql.fi
8f4fef291d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-22 20:32:19 +02:00
serg@janus.mylan
e55719ac3b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-22 17:05:24 +01:00
monty@mysql.com/narttu.mysql.fi
6946fa682f
After merge fixes
...
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
2007-02-21 19:38:40 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02:00
serg@janus.mylan
689eed7406
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-21 11:36:23 +01:00
thek@kpdesk.mysql.com
bfea428c5a
Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime
2007-02-19 16:13:13 +01:00
thek@kpdesk.mysql.com
84b96eb5e8
Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00' as the date time
...
- Merged from 5.0
- Removed redundant call to set_time(); now included in init_for_queries
2007-02-19 16:09:55 +01:00
tomas@poseidon.mysql.com
91c36268c7
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-14 15:31:00 +07:00
tomas@poseidon.mysql.com
b7c3aeae2c
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-14 15:18:15 +07:00
tomas@poseidon.mysql.com
120eaec17c
Bug #21033 Error 0 in readAutoIncrementValue()
...
- do not call function if table has no autoincrement
2007-02-14 15:16:26 +07:00
mskold/marty@linux.site
6e418074b6
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-09 16:40:36 +01:00
mskold/marty@linux.site
d6bb9d21bf
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-09 16:33:52 +01:00
mskold/marty@mysql.com/linux.site
6ac9a28ef0
bug #26225 Engine condition pushdown doesn't work with prepare statements (ps_7ndb): ensure that query plan for prepared statement is analyzed correctly
2007-02-09 16:31:12 +01:00
tomas@poseidon.mysql.com
f05a67c72b
ndb: correction of "ignore error" patch
2007-02-08 01:09:38 +07:00
tomas@poseidon.mysql.com
d56756de0a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-08 00:00:14 +07:00
mskold/marty@mysql.com/linux.site
5df38bfc3e
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-02-07 12:29:34 +01:00