mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31372 commits 2784 branches 343 tags 1.6 GiB
Commit graph

14876 commits

Author SHA1 Message Date
msvensson@shellback.(none)
aac14ae4a1 Merge neptunus://home/msvensson/mysql/bug16795/my51-bug16795 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 13:04:48 +01:00
msvensson@neptunus.(none)
0c44abbb47 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795 
into  neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
 2006-02-28 13:03:26 +01:00
msvensson@shellback.(none)
916f763b9e Merge neptunus:/home/msvensson/mysql/bug16795/my50-bug16795 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 13:03:00 +01:00
msvensson@shellback.(none)
83ef0486b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 13:00:23 +01:00
knielsen@mysql.com
19c4ba39c4 Windows compile fixes. 2006-02-28 12:52:38 +01:00
tomas@poseidon.ndb.mysql.com
4dee17f159 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-28 12:40:19 +01:00
tomas@poseidon.ndb.mysql.com
81479bde6a Bug #17701, ALTER TABLE t1 ADD PARTITION for PARTITION BY LIST hangs test 
- code wrongly tries to do a "fast alter partition", although not supported
 2006-02-28 12:29:50 +01:00
tomas@poseidon.ndb.mysql.com
fecfbb4834 Bug#16385, Partitions: crash when updating a range partitioned NDB table 
- too little space was allocated for receiving events, partition uses extra column in table
 2006-02-28 12:28:52 +01:00
tomas@poseidon.ndb.mysql.com
9850332741 Bug #17763 mysqld cores with list partitioning if update to missing partition 
- error string wrongly formatted
 2006-02-28 12:27:53 +01:00
andrey@lmy004.
8fe55c09db manual merge 2006-02-28 12:08:13 +01:00
andrey@lmy004.
483a6d06fa fix for bug#16537 (Events: mysql.event.starts is null) 
- now when the event is created and STARTS is omitted then STARTS is implicitly
  CURRENT_TIMESTAMP
- This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
(incorporated review changes)
 2006-02-28 11:43:10 +01:00
msvensson@shellback.(none)
59af694195 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 11:10:39 +01:00
msvensson@shellback.(none)
a79c6b60d2 Merge neptunus:mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 11:03:18 +01:00
msvensson@shellback.(none)
359b2ef4dc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 11:00:47 +01:00
msvensson@shellback.(none)
318bee862a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 11:00:35 +01:00
bar@mysql.com
bcc72ad04f Bug#16313 XML: extractvalue() ignores '!' in names 
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Fixed that the "!" character written at the end was ignored.

  Now if we try to scan "!=", and if "!" is not
  followed by "=", we rollback lex scanner back 
  to "!" token, so the parser will start to check
  the next rule from the "!" character again.

  Previously parser started from the next character,
  which was EOF in the example in xml.test,
  which led to query being successfully parsed,
  instead of producing a syntax error.
 2006-02-28 13:59:16 +04:00
msvensson@neptunus.(none)
2e401e202d Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 10:55:05 +01:00
msvensson@neptunus.(none)
7551c8d7f8 Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 10:52:36 +01:00
msvensson@devsrv-b.mysql.com
ef8b5b47e8 Merge devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279 
into  devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279
 2006-02-28 10:44:48 +01:00
gluh@eagle.intranet.mysql.r18.ru
149ecabb50 bug#17568 mysql_fix_privilege_tables doesn't create mysql.plugin 
'mysql_install_db' changed to 'mysql_upgrade' in error message
 2006-02-28 12:42:06 +04:00
holyfoot@deer.(none)
91d09f4635 Fixed crashes in embedded-server tests 2006-02-28 12:21:56 +04:00
lars@mysql.com
616a47cc6d BUG#17752: Non-allocated memory caused core in rpl_multi_engine test 2006-02-27 22:14:46 +01:00
lars@mysql.com
05d1921181 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-bug13418
 2006-02-27 19:26:31 +01:00
lars@mysql.com
2ebe57777f BUG#13418: Virtualized some functions so that Bit_field class will use correct cmp functions 2006-02-27 18:34:04 +01:00
dlenev@mysql.com
c09d27c94d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
 2006-02-27 20:11:54 +03:00
dlenev@mysql.com
8dbdf5237e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
 2006-02-27 20:00:07 +03:00
dlenev@mysql.com
6137476427 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-27 20:00:05 +03:00
SergeyV@selena.
763475754a Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#15943-mysql-5.0
 2006-02-27 20:00:03 +03:00
dlenev@mysql.com
6cb5c38c14 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-27 20:00:03 +03:00
mats@mysql.com
f0f8795beb Post-merge fixes. 2006-02-27 17:23:20 +01:00
tomas@poseidon.ndb.mysql.com
bfc43d5745 Bug #17499 Alter table of ndb partitioned tables causes mysqld to core 2006-02-27 17:04:49 +01:00
msvensson@neptunus.(none)
e2423d5e05 BUG#2845 client fails to reconnect if using TCP/IP 
- Use 'poll' if available
 - Check that sd <= FD_SETSIZE if using 'select'
 - Handle case when 'net_data_is_ready' returns -1, ie. sd > FD_SETSIZE and 'select' is used
 2006-02-27 16:44:23 +01:00
msvensson@devsrv-b.mysql.com
706070fbf8 Bug#17279 user with no global privs and with create priv in db can create databases 
- Use binary charset in acl_cache, to make searches case sensitive
 - Add testcase
 2006-02-27 16:41:58 +01:00
SergeyV@selena.
78f014f0d7 Postfix for #15943. Explicit call of thd->clear_error() is added. 2006-02-27 16:52:14 +03:00
msvensson@shellback.(none)
ebc2ba744c Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/bug17721/my51-bug17721
 2006-02-27 14:33:52 +01:00
msvensson@shellback.(none)
6c35d51cb8 Bug#17721 Test 'exampledb' hangs on Windows 
- Removed ifdefs from handler class
- The handler class is an external interface to dynamically loadable storage engine and should not be changed by defines. This is especially important for the virtual functions.
 2006-02-27 14:21:48 +01:00
msvensson@neptunus.(none)
4bbf5eb01c Bug#16795 ndb_cache_multi2 
- Change && to ||
 - Check for return value != 0 in "ndb->init()"
 2006-02-27 10:29:55 +01:00
sergefp@mysql.com
0048ea9bb3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug17314
 2006-02-27 11:36:41 +03:00
mats@mysql.com
a865af0d4b Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/fix-mysql-5.1-release
 2006-02-27 09:09:02 +01:00
dlenev@mysql.com
4ca3409390 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-26 21:20:13 +03:00
monty@mysql.com
386276d89d Cleanups 
Don't run upgrade.test with embedded server as it requires mysqlcheck
 2006-02-26 16:03:43 +02:00
dlenev@mysql.com
0b422c635d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-26 16:38:48 +03:00
monty@mysql.com
e6a98314a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-02-26 15:12:56 +02:00
monty@mysql.com
e3796c924f After merge fixes 2006-02-26 15:11:56 +02:00
kent@mysql.com
1bc614f204 log_event.cc: 
Visual C++ dont relate 'byte' and 'char*' that close, added casts
mysql.sln:
  Only build mysqlserver.lib if embedded target
 2006-02-26 01:16:11 +01:00
guilhem@mysql.com
3f3473cfb5 Fix for a segfault in my previous cset (about WL#2712 and WL#2977). 2006-02-26 00:03:52 +01:00
guilhem@mysql.com
eb4688330d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-new
 2006-02-25 22:22:12 +01:00
guilhem@mysql.com
0071749595 WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement), 
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave),  or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
 2006-02-25 22:21:03 +01:00
monty@mysql.com
1e2e9e2856 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-02-25 21:54:34 +02:00
kent@mysql.com
7018ab293d drop-on-restart.inc: 
Drop 'mysqlslap'
  Added database name 'ndbsynctest'
sql_table.cc, create.test, create.result:
  Patch for bug#17530 done by evgen, extracted from 5.0
 2006-02-25 20:17:07 +01:00
monty@mysql.com
ab78d065ec Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-25 17:48:09 +02:00
monty@mysql.com
54274976e7 Fixed compiler warnings from gcc 4.0.2: 
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers
 2006-02-25 17:46:30 +02:00
monty@mysql.com
a7df038d16 Add back free that I accidently removed in last patch 2006-02-25 13:58:00 +02:00
monty@mysql.com
eff69e73a3 Fixed typo 2006-02-25 13:49:43 +02:00
monty@mysql.com
6fd52639c0 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-25 13:26:05 +02:00
monty@mysql.com
dd1d40f8f8 Fixed new introduced bug in binlog.test with --ps-protocol 2006-02-25 13:24:18 +02:00
brian@zim.(none)
f40705eb9b Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-02-24 23:31:57 -08:00
sergefp@mysql.com
8bb9343688 Fix a typo in dbug printout 2006-02-25 00:41:37 +03:00
dlenev@mysql.com
0c15039e74 Fix for bug #13525 "Rename table does not keep info of triggers". 
Let us transfer triggers associated with table when we rename it (but only if
we are not changing database to which table belongs, in the latter case we will
emit error).
 2006-02-24 23:50:36 +03:00
mats@mysql.com
c33a64a0e3 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/bk/mysql-5.1-release-bug13418-lars
 2006-02-24 20:27:51 +01:00
monty@mysql.com
aa4128f811 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-24 18:36:09 +02:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it 
(Needed for "list of pushes" web page and autopush)
 2006-02-24 18:34:15 +02:00
reggie@linux.site
52fbc7a1cd BUG# 17430 Partitoins: crash on SELECT * FROM t1 WHERE f_int1 IS NULL 
BUG# 17432: Partitions: wrong result, SELECT ... WHERE <column> is null
 2006-02-24 10:10:41 -06:00
lars@mysql.com
b4953f12a2 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-release-bug13418
 2006-02-24 16:22:06 +01:00
lars@mysql.com
32a8a469a7 BUG#13418 (V2): Bit columns should replicate correctly when using RBR 2006-02-24 15:38:20 +01:00
andrey@lmy004.
b6f338e9e5 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16411
 2006-02-24 14:14:51 +01:00
andrey@lmy004.
11e5e40ede fix for bug #16411 (microseconds are allowed) 
last fixes
 2006-02-24 14:08:34 +01:00
andrey@lmy004.
734bfe4759 fix for bug #16411 (Microseconds are allowed for events) 2006-02-24 14:02:26 +01:00
evgen@moonbone.local
bcff10f1fb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/17530-bug-5.0-mysql
 2006-02-24 14:29:41 +03:00
andrey@lmy004.
c4602da973 merge 2006-02-24 12:03:32 +01:00
andrey@lmy004.
a594cd080c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16412
 2006-02-24 11:56:16 +01:00
andrey@lmy004.
c04b3f4a91 Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information) 
WL#1034 (Internal CRON)
 2006-02-24 11:52:03 +01:00
elliot@mysql.com
7e3f3f74cd Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-release
 2006-02-23 23:21:53 -05:00
elliot@mysql.com
5753dfe73d BUG#17521 alter database crashes slave 
Problem was a null pointer
Fixed by passing correct database name to slave filtering mechanism
Added test.
 2006-02-23 23:20:29 -05:00
andrey@lmy004.
68a0112047 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release
 2006-02-24 00:33:26 +01:00
andrey@lmy004.
5ac46bb961 fix for bug #16400 2006-02-24 00:29:50 +01:00
mats@mysql.com
adc9723611 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/bk/fix-mysql-5.1-release
 2006-02-23 22:21:07 +01:00
mats@mysql.com
0cc0884200 Bug#17678 (RBR format change: moving from VLE to net encoding): 
Switching to use net_*_length() instead of VLE functions.
 2006-02-23 22:19:47 +01:00
konstantin@mysql.com
49ad134e9f After-merge fixes (Bug#13134) 2006-02-24 00:12:04 +03:00
konstantin@mysql.com
90edf3720a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-24 00:09:47 +03:00
konstantin@mysql.com
af62c4a959 Merge mysql.com:/opt/local/work/mysql-4.1-13134 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-24 00:00:15 +03:00
paul@snake-hub.snake.net
85869e5fde Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-23 11:08:16 -06:00
paul@snake-hub.snake.net
f47ed62fb0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-23 11:07:56 -06:00
paul@snake-hub.snake.net
4ca8a492e2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-23 09:41:04 -06:00
paul@snake-hub.snake.net
b2529c2ab2 mysqld.cc: 
Fix out of order entries in option struct.
 2006-02-23 09:11:05 -06:00
konstantin@mysql.com
630869bc56 Cleanup. 2006-02-23 16:21:43 +03:00
mats@mysql.com
584388c74c Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/users/mkindahl/bk/merge-b17181-mysql-5.1-new
 2006-02-23 13:49:27 +01:00
mats@mysql.com
5dab541c3a Bug#17181 (mysqlslap test server crash): 
Moving assignments to table_map_id for thread-safe handling of
  table shares.
 2006-02-23 13:34:03 +01:00
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:54:56 +01:00
msvensson@neptunus.(none)
71ef9102c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-23 10:45:39 +01:00
msvensson@neptunus.(none)
8d78cd3e3c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:41:37 +01:00
konstantin@mysql.com
0621428d79 Fix a bad merge of mine. 2006-02-23 12:32:54 +03:00
reggie@linux.site
3de74e6237 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-02-22 14:18:45 -06:00
reggie@linux.site
6cea16a825 BUG# 17393: Partitions: Wrong error message when assigning too many subpartitions 
We changed the error message to more clearly reflect the fact
that we are counting parts and subparts
 2006-02-22 14:17:11 -06:00
konstantin@mysql.com
5d07195888 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 20:15:24 +03:00
konstantin@mysql.com
97d36a453e Post-merge fixes. 2006-02-22 20:03:25 +03:00
aelkin@mysql.com
35861f3006 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug17265
 2006-02-22 18:53:34 +02:00
aelkin@mysql.com
4155d1405e BUG#17265 Assertion failure in rpl_row_view01. 
To quote Timour review lines:

The actual cause of the bug is that sql_base.cc:setup_wild()
sets "select_lex->with_wild = 0" (in the end of the function) once
it expands all wild-cards, and wild-card expansion is done during
the prepare phase. During this phase we replace all "*" with the
corresponding items, which for views happen to be references to
references. When we do execute, select_lex->with_wild = 0, and
all "*" are already replaced by the corresponding items, which
in the case of views need to be dereferenced first.

Fixed by refining the assert. Regression test for the bug is rpl_row_view01,
as was reported.
 2006-02-22 17:07:18 +02:00
mskold@mysql.com
bdf3e238b8 Removed unnecessary unlock/lock of mutex 2006-02-22 16:05:57 +01:00
mskold@mysql.com
865a3c9204 Fixes for push version of discover of on-line altered table 2006-02-22 15:19:22 +01:00