mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31031 commits 2784 branches 343 tags 1.6 GiB
Commit graph

14704 commits

Author SHA1 Message Date
andrey@lmy004.
3bd895745c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17289
 2006-02-15 14:35:19 +01:00
serg@serg.mylan
d5294e86bf Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-02-15 14:04:56 +01:00
ingo@mysql.com
aa10c18a6e Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-15 13:02:24 +01:00
mskold@mysql.com
5e4df23c96 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
 2006-02-15 12:52:30 +01:00
andrey@lmy004.
a01ed15419 cosmetic changes of the fix for bug#17289 (no privileges checks in EVENTS), before push 2006-02-15 12:14:23 +01:00
gluh@eagle.intranet.mysql.r18.ru
544a1a98a5 Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX 
In presense of subpartitioning use get_part_partition_id() to calculate part_id
 2006-02-15 14:34:51 +04:00
mskold@mysql.com
64aa3861a4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
 2006-02-15 11:19:45 +01:00
ingo@mysql.com
aa12184eda Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-15 10:56:13 +01:00
gluh@eagle.intranet.mysql.r18.ru
00fc4cabe5 Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key 
use part_info->no_subparts to calculate partition range in case of subpartitions
 2006-02-15 13:42:43 +04:00
brian@zim.tangent.org
d56430423a This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions. 
Also added a flush table test as well. Found one possible bug in OPTIMIZE TABLE which has never been reported, but I think it would be possible on a file system that ran out of disk.
 2006-02-15 00:59:24 -08:00
ingo@mysql.com
4c1735186b Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-15 07:43:43 +01:00
serg@serg.mylan
4e68f1ba3a post-merge fixes for dbug 2006-02-15 00:14:37 +01:00
aelkin@mysql.com
3737486d56 Merge elkin@koti:MySQL/Merge/5.1-new/ 
into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new
 2006-02-15 01:08:02 +02:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
andrey@lmy004.
9db6d13cc4 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17289
 2006-02-14 23:35:13 +01:00
serg@serg.mylan
94d225aa6f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-02-14 22:57:12 +01:00
serg@serg.mylan
a511d770ee my_bool is internal type, so should be SHOW_MY_BOOL 2006-02-14 22:51:16 +01:00
serg@serg.mylan
63cfd11859 dbug changes: 
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
 2006-02-14 22:36:11 +01:00
andrey@lmy004.
dd999e9eee make declarations of mysql_db_table_last_check and mysql_db_table_fields 
visible event in libmysqld. fixes build problem.
 2006-02-14 22:21:23 +01:00
aelkin@mysql.com
9b1e80b941 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
 2006-02-14 22:02:42 +02:00
andrey@lmy004.
3e6376589b make it explicitly extern. this should fix build failure on FC4 2006-02-14 20:58:19 +01:00
andrey@lmy004.
6d54ee58a4 manual merge 2006-02-14 20:27:42 +01:00
ingo@mysql.com
db905454ab Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-14 20:17:25 +01:00
andrey@lmy004.
e9af8c1d83 post-merge fixes of bug 16548 2006-02-14 20:10:51 +01:00
aelkin@mysql.com
a70ac6eadf Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
 2006-02-14 20:51:08 +02:00
aelkin@mysql.com
7397bc8fb4 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
 2006-02-14 20:48:34 +02:00
andrey@lmy004.
a47a706d1f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17289
 2006-02-14 19:44:10 +01:00
aelkin@mysql.com
42cc473df3 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-02-14 20:19:00 +02:00
andrey@lmy004.
bb3ac3e368 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17289
 2006-02-14 17:54:03 +01:00
andrey@lmy004.
446c791e56 post-merge fixes 2006-02-14 17:51:22 +01:00
evgen@moonbone.local
131217eb6f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/16272-bug-5.0-mysql
 2006-02-14 19:46:35 +03:00
andrey@lmy004.
d5d11a9c23 manual merge 2006-02-14 17:05:36 +01:00
mskold@mysql.com
dafc2c7aad Post-review fix (WL#2987) 2006-02-14 16:50:51 +01:00
andrey@lmy004.
815927e590 - final fixes for bug#16431 (Events: An event which alters itself disappears) 
- fix for bug#16423 (Events: SHOW CREATE EVENT doesn't work)
- this Changeset commits makes CREATE/UPDATE/DELETE EVENT real DDL statements
  by committing the currently open transaction before they are executed.
- this Changeset also fixes a trailing space problem since the very early days
  of the internal cron
- adds sophisticated checking of whether mysql.event was tampered accidentally
  or with purpose by an user.
- adds a lot of inline function documentation - documents everything left
  uncodumented
- INTERVAL_XXXX to XXX in I_S.EVENTS.INTERVAL_FIELD

WL#1034 (Internal CRON)
 2006-02-14 16:20:48 +01:00
ingo@mysql.com
7c06b0a4c1 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-14 15:22:24 +01:00
serg@serg.mylan
8a242d96e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
 2006-02-14 15:09:28 +01:00
mskold@mysql.com
36715c70f7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
 2006-02-14 15:01:41 +01:00
evgen@moonbone.local
8f904e9cab Fixed bug#16272: IF function with decimal args can produce wrong result 
The Item_func_if::fix_length_and_dec() function when calculating length of 
result doesn't take into account unsigned_flag. But it is taken when 
calculating length of temporary field. This result in creating field that 
shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.

The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
the unsigned_flag isn't set.
 2006-02-14 16:22:37 +03:00
ingo@mysql.com
726ec9fa7a Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-14 13:46:19 +01:00
serg@serg.mylan
9db19fdf9e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
 2006-02-14 13:26:47 +01:00
serg@serg.mylan
b283fb79d0 MATCH(a,b) AGAINST (... IN NATURAL LANGUAGE MODE) 
remove explicit $<ulong_num>$ from sql_yacc.yy
 2006-02-14 13:19:54 +01:00
mskold@mysql.com
5230866f59 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
 2006-02-14 11:51:44 +01:00
aelkin@mysql.com
5bd5967bdb Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-02-14 12:44:26 +02:00
svoj@april.(none)
7e8b145b94 BUG#17117: header fille "plugin.h" does not have a namespace prefix 
plugin.h has been moved into include/mysql/plugin.h
 2006-02-14 13:51:25 +04:00
gluh@eagle.intranet.mysql.r18.ru
c42a608d6f Bug#16591 Partitions: crash using information_schema.partitions 
Bug#16695 Reading I_S.PARTITIONS with pre-5.1.6 partitioned tables crashes server
 issue a warning in case of error during table opening
 2006-02-14 12:52:38 +04:00
evgen@moonbone.local
84a775ca3c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/16752-bug-5.0-mysql
 2006-02-14 11:33:46 +03:00
ingo@mysql.com
b4b5dc18c4 Merge mysql.com:/home/mydev/mysql-5.0-bug8841 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-14 09:29:37 +01:00
igor@rurik.mysql.com
3ecd3c343c Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-02-13 23:04:10 -08:00
bar@mysql.com
561d7a03aa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.cs_fs
 2006-02-14 08:25:09 +04:00
bar@mysql.com
cc3623aecf Many files: 
Backporting character_set_filesystem from 5.0 to 5.1.
 2006-02-14 08:24:01 +04:00
igor@rurik.mysql.com
de6eedd756 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-13 18:56:42 -08:00
igor@rurik.mysql.com
75b6930d54 Fixed bug #16603. 
A subquery transformation changes the HAVING clause of the embedding query if the subquery contains
a GROUP BY clause. Yet the split_sum_func2 function was not applied to the modified HAVING clause.
This could result in wrong answers.
 2006-02-13 18:50:06 -08:00
serg@serg.mylan
e27d2a5873 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
 2006-02-13 23:27:51 +01:00
tomas@poseidon.ndb.mysql.com
efd6779c80 Bug #17340 SHOW CREATE TABLE from second session crashes the server 
- no check was made that ndb thd object was allocated
 2006-02-13 21:55:49 +01:00
aelkin@mysql.com
a5da4ce669 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
 2006-02-13 22:00:11 +02:00
tomas@poseidon.ndb.mysql.com
b1967abdce 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-13 20:35:35 +01:00
tomas@poseidon.ndb.mysql.com
87a6266fa4 Bug #17179 schema creation fails 
-flag was set on field intable share instead of table
 2006-02-13 20:34:36 +01:00
brian@zim.tangent.org
14c05a7fd7 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
 2006-02-13 10:26:31 -08:00
brian@zim.tangent.org
778ca614a1 Fix for bad merge. 2006-02-13 10:21:33 -08:00
jimw@mysql.com
7cdfacde68 Bug #16775: DROP TABLE of subpartitioned table can fail if default engine 
used. The problem is that the actual engine was not stored in the .par
file, causing confusion when the default engine was changed. Now the
actual storage engine is stored for subpartitions, as was intended.
 2006-02-13 10:15:42 -08:00
paul@snake-hub.snake.net
78f4f94059 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
 2006-02-13 11:22:49 -06:00
paul@snake-hub.snake.net
5f2a401dba set_var.cc: 
Fix out-of-order system variable.
 2006-02-13 11:20:15 -06:00
aelkin@mysql.com
e7a0822a47 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
 2006-02-13 19:17:02 +02:00
tomas@poseidon.ndb.mysql.com
9ec6f1ea57 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-13 16:06:02 +01:00
mskold@mysql.com
1e85c05d67 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
 2006-02-13 14:56:45 +01:00
tomas@poseidon.ndb.mysql.com
ce04588ca8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-13 14:32:04 +01:00
brian@zim.tangent.org
0b30190c22 Disabling a test, I will look at it tomorrow. Something is wrong with the merge from 5.0. Its probably a flush that is missing somewhere but I am too tired to figure it out at the moment. 2006-02-13 05:31:43 -08:00
tomas@poseidon.ndb.mysql.com
9a3b27dae9 manual merge 2006-02-13 14:25:31 +01:00
anozdrin@mysql.com
5650e65d04 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree
 2006-02-13 15:22:06 +03:00
brian@zim.tangent.org
30fdcc6be4 Merge zim.tangent.org:/home/brian/mysql/mysql-5.0 
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
 2006-02-13 04:22:05 -08:00
brian@zim.tangent.org
f43fa4a688 Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows. 2006-02-13 04:11:22 -08:00
anozdrin@mysql.com
c6c33f4832 Polishing: after implementing TRIGGER privilege, mysqld option 
'--log-bin-trust-function-creators' affects not only replication of the
stored functions, but also replication of the triggers.
 2006-02-13 15:00:01 +03:00
tomas@poseidon.ndb.mysql.com
4f449e4f22 ndb: 
add optional reporting of of a "name" tied to a nodeid in the cluster log
reporting added for mysql server and ndb_restore
 2006-02-13 12:58:12 +01:00
mskold@mysql.com
e593c614cb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-13 11:25:18 +01:00
mskold@mysql.com
5db302c834 Added on-line handling of altered frm in binlog thread 2006-02-13 11:23:13 +01:00
bar@mysql.com
53a0372d87 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
 2006-02-13 11:53:56 +04:00
bar@mysql.com
611cbc2f4d renamedb.test, renamedb.result: 
new file
Many files:
  WL#757 RENAME DATABASE
 2006-02-13 11:49:28 +04:00
brian@zim.tangent.org
fd2b90d174 Removing unused variable (old have_isam). 2006-02-12 22:43:59 -08:00
brian@zim.tangent.org
0c487a79c9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/dep-5.1
 2006-02-12 13:27:56 -08:00
brian@zim.tangent.org
0a5a30bef3 This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
brian@zim.tangent.org
eeefb8ba7c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/raid/mysql-5.1-new
 2006-02-11 17:26:32 -08:00
brian@zim.tangent.org
9485856f1a This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this. 2006-02-11 17:21:01 -08:00
ingo@mysql.com
b9bc1e9108 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
 2006-02-10 20:00:22 +01:00
tomas@poseidon.ndb.mysql.com
0ec372ed21 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-10 18:08:04 +01:00
tomas@poseidon.ndb.mysql.com
f0d95d0af3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-10 18:04:46 +01:00
tomas@poseidon.ndb.mysql.com
5ba3f69f3e manual merge 2006-02-10 17:59:53 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do not have pk 
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
 2006-02-10 17:40:22 +01:00
mskold@mysql.com
5c2c52b0cb Added partition pruning checks (WL#2987) 2006-02-10 17:06:24 +01:00
andrey@lmy004.
3e89e1ccb2 fix for bug #17289 Events: missing privilege check for drop database 
Events were executed with all privileges possible on planet Earth :(
WL#1034
 2006-02-10 15:02:57 +01:00
joerg@mysql.com
6c464815c9 Several Netware specific fixes. 
Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@ua141d10.elisa.omakaista.fi
now just copied to the 5.1.6 build clone.
 2006-02-10 13:50:22 +01:00
bar@mysql.com
f057c9b4e7 Bug#16234 XML: Crash if ExtractValue() 
Also fixes 16314: XML: extractvalue() crash if vertical bar
xml.result, xml.test:
  Adding test case
item_xmlfunc.cc:
  Using root element as a context node,
  instead of NULL, with relative paths.
 2006-02-10 13:24:10 +04:00
petr@mysql.com
392f93c0aa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
 2006-02-10 03:37:13 +03:00
tomas@poseidon.ndb.mysql.com
5bb07f7e1f 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-10 00:17:33 +01:00
tomas@poseidon.ndb.mysql.com
fe0ff3e21c 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-09 23:48:52 +01:00
andrey@lmy004.
0aced4daf3 remove volatile. fixes windows build 
WL#1034 (Internal CRON)
 2006-02-09 23:15:48 +01:00
tomas@poseidon.ndb.mysql.com
246d0ea290 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-09 23:15:46 +01:00
andrey@lmy004.
24c010892c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-09 23:15:46 +01:00
aivanov@mysql.com
f8f8af970e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
 2006-02-10 01:15:45 +03:00
tomas@poseidon.ndb.mysql.com
930641a5c1 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-09 21:28:22 +01:00
andrey@lmy004.
67985360f0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-09 20:20:22 +01:00
andrey@lmy004.
34b3d54839 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16984
 2006-02-09 20:17:49 +01:00
tomas@poseidon.ndb.mysql.com
3c0ed6d410 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-09 19:55:50 +01:00
aivanov@mysql.com
e22d2f1150 Fixed BUG#9680: Wrong error from cascading update 
Applied 9680.patch (by Osku Salerma)
 2006-02-09 20:43:10 +03:00
aelkin@mysql.com
dd2a44c497 BUG#16217 forced to introduce a separate mysql client command to adopt its 
internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.

There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.

Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
 2006-02-09 16:23:09 +02:00
konstantin@mysql.com
2a267fed2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-09 14:22:34 +03:00
konstantin@mysql.com
e1f807af26 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-09 13:35:59 +03:00
knielsen@mysql.com
2b5a4e2807 Merge mysql.com:/usr/local/mysql/mysql-5.1-winfix 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-02-09 09:34:42 +01:00
brian@zim.tangent.org
01a8c54406 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
 2006-02-08 21:55:40 -08:00
tomas@poseidon.ndb.mysql.com
d39cb0eb0c 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-09 06:45:28 +01:00
konstantin@mysql.com
19018128a3 Merge mysql.com:/home/kostja/mysql/tmp_merge1 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-09 00:21:22 +03:00
tomas@poseidon.ndb.mysql.com
c4c4510a54 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-08 22:15:34 +01:00
tomas@poseidon.ndb.mysql.com
c05463289d Bug #17206 Update through VIEW is not working 
post review fixes
Bug fix added missing setting of rw_set for table handler when update occurs via a view.   The missing setting of the rw_set resulted in fields not being updated for ndb tables
 2006-02-08 22:13:47 +01:00
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 23:53:45 +03:00
reggie@linux.site
b23901d95b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-02-08 11:20:34 -06:00
tomas@poseidon.ndb.mysql.com
edd1417b46 Bug #17206 Update through VIEW is not working 2006-02-08 18:08:18 +01:00
tomas@poseidon.ndb.mysql.com
44f2bd578c 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-08 17:14:32 +01:00
evgen@moonbone.local
3a3f8379cb Fixed bug#16752 Binary table files created in mysqld v4.1 caused buffer overrun 
and possibly server crash in mysqld v5.0.

Reported MyISAM table was created in mysqld 4.1 and contains varchar field.
When binary files of that table was moved to 5.0, mysqld treats that varchar 
field as a string field. 
In order to make grouping server calculates group buffer, and because
that field is string server assumes it has fixed length and doesn't add
space for length, but later that field is converted to varchar field. 
Due to this, when field values were actually copied, additional space for
length bytes is taken and buffer overrun occurs, which may lead to server crash.

The calc_group_buffer() function now reserves additional space for length
bytes for VAR_STRING fields, like for VARCHAR fields.
 2006-02-08 15:12:48 +03:00
konstantin@mysql.com
365404a048 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 14:05:19 +03:00
andrey@lmy004.
9951b9db96 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-08 11:54:37 +01:00
tomas@poseidon.ndb.mysql.com
d3a80b4710 Bug #17200 Comment for SHOW ENGINES should be changed for Cluster 2006-02-08 11:29:46 +01:00
konstantin@mysql.com
d4c5516929 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 13:11:44 +03:00
reggie@linux.site
760bc0a225 bug# 17082 Client hangs when creating tables with partition 
This bug was only on Windows but we updated the call to 
create_temporary_file to match what is being done in other
areas of MySQL
 2006-02-08 04:05:18 -06:00
reggie@linux.site
88ba26e15f Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-02-08 04:05:17 -06:00
konstantin@mysql.com
7452faa503 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 13:01:27 +03:00
anozdrin@mysql.com
66e1e8d4a6 Fix for BUG#17180: Failure in trigger-grant on Solaris. 
The problem is that LEX_STRING was used instead of LEX_STRING::str.
 2006-02-08 12:54:54 +03:00
anozdrin@mysql.com
e24336b0c8 Fix compilation failure. 2006-02-08 12:51:28 +03:00
brian@zim.tangent.org
23d99ee03c The handlerton structures for archive and CSV had not been updated. Nicht so gute. I also fixed CSV to use fast alter table and put in a test in archive in case someone tries to do the same there (hint... it won't work). 2006-02-07 22:42:57 -08:00
ramil@mysql.com
ebe1eed8aa Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b16511
 2006-02-08 10:34:30 +04:00
petr@mysql.com
7aa7e4b437 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
 2006-02-08 09:15:41 +03:00
andrey@lmy004.
fa143d255c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16984
 2006-02-07 23:57:39 +01:00
andrey@lmy004.
4b0f608472 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-07 23:40:03 +01:00
kent@mysql.com
d6be5dcecb sql_plugin.cc: 
Bug#17196, --default-storage-engine option broken
configure.in:
  This is an alpha
 2006-02-07 22:39:55 +01:00
konstantin@mysql.com
da377d1ec8 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 00:33:31 +03:00
konstantin@mysql.com
e656863033 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 00:02:56 +03:00
pekka@mysql.com
14249f23ed Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 21:52:56 +01:00
reggie@linux.site
e74b609881 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-02-07 13:54:42 -06:00
gunnar@mysql.com.
f6590a3b89 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0
 2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 20:04:54 +01:00
msvensson@neptunus.(none)
4ddcc7ccc2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 20:02:08 +01:00
pekka@mysql.com
9aa06f3bc1 ndb - bug#15918 fix 2006-02-07 19:57:31 +01:00
andrey@lmy004.
64c34f101f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-07 19:37:26 +01:00
andrey@lmy004.
4ba2a3322b - fix for bug #16414 (Events: Crash or hang if event drops itself) 
WL#1034 (Internal CRON)
(with post-review fix)
 2006-02-07 19:28:33 +01:00
andrey@lmy004.
335c6e8877 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16984
 2006-02-07 19:23:39 +01:00
tomas@poseidon.ndb.mysql.com
99cbc34b44 Bug #17188 CRBR: ignores --binlog_ignore_db= settings 2006-02-07 19:02:38 +01:00
msvensson@neptunus.(none)
4fc2b92692 Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 18:12:23 +01:00
reggie@linux.site
824ac10fbc BUG# 17082 - Client hangs when creating tables with partition 
no test case needed since simply creating a partitioned table 
reproduces it.
 2006-02-07 10:45:11 -06:00
tomas@poseidon.ndb.mysql.com
53040a0762 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-07 17:45:10 +01:00
gunnar@mysql.com.
a0b0cb5551 Merge mysql.com.:/data/BK/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0_8461_b
 2006-02-07 17:15:12 +01:00