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

16420 commits

Author SHA1 Message Date
serg@sergbook.mysql.com
7135b559ab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
 2006-05-30 18:24:06 +02:00
serg@sergbook.mysql.com
9eb15a0e8f sql/Makefile.am: better mysqld dependencies 
sql/discover.cc:    close(-1) bug
sql/slave.cc:       DBUG_ENTER/RETURN tags
ha_archive.cc:      double-close bug
 2006-05-30 18:21:03 +02:00
serg@serg.mylan
b214937fde reduce error log spamming by old privilege tables. If they're old, 
report it once, don't whine about every missing column.
 2006-05-30 18:18:13 +02:00
gbichot@dl145j.mysql.com
2367ca4675 Merge gbichot@bk-internal:/home/bk/mysql-5.1-new 
into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
 2006-05-30 16:21:51 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c81b4c01bf Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2006-05-30 16:07:49 +03:00
iggy@mysql.com
433c57d997 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/mnt/storeage/mysql-5.0-maint_bug18669
 2006-05-30 08:22:12 -04:00
elliot@mysql.com
1a7ad4e45d Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
 2006-05-30 07:57:12 -04:00
mskold@mysql.com
f838e8a499 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-4.1
 2006-05-30 13:20:38 +02:00
andrey@lmy004.
1edd2cf833 update show authors 2006-05-30 10:22:31 +02:00
igor@rurik.mysql.com
6051e0f959 Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX 
refers to a column name.
 2006-05-30 00:08:58 -07:00
gluh@eagle.intranet.mysql.r18.ru
ae72df07f2 Bug#17204 "second CALL to procedure crashes Server" 
Bug#18282 "INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views"
This bug caused crashes or resulted in wrong data being returned
when one tried to obtain information from I_S tables about views
using stored functions.

It was caused by the fact that we were using LEX representing
statement which were doing select from I_S tables as active LEX
when contents of I_S table were built. So state of this LEX both
affected and was affected by open_tables() calls which happened
during this process. This resulted in wrong behavior and in
violations of some of invariants which caused crashes.

This fix tries to solve this problem by properly saving/resetting
and restoring part of LEX which affects and is affected by the
process of opening tables and views in get_all_tables() routine.
To simplify things we separated this part of LEX in a new class
and made LEX its descendant.
 2006-05-30 10:45:23 +05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
d3ea79ff52 BUG#19801: Valgrind error in check_list_constants 
Needed some special handling of the case when no_list_values == 0
 2006-05-30 00:08:48 -04:00
petr@mysql.com
67d3675549 update show authors 2006-05-30 03:26:58 +04:00
andrey@lmy004.
35b6416fcf Merge lmy004.:/work/mysql-5.1-new-vanilla 
into lmy004.:/work/mysql-5.1-runtime
 2006-05-29 20:23:44 +02:00
msvensson@neptunus.(none)
10719727ff Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-29 15:43:00 +02:00
msvensson@neptunus.(none)
e7375bd438 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-29 15:32:52 +02:00
ingo@mysql.com
ed2e475548 Merge mysql.com:/home/mydev/mysql-5.0-bug19815 
into  mysql.com:/home/mydev/mysql-5.1-bug19815
 2006-05-29 15:30:13 +02:00
ingo@mysql.com
d00441e328 Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock 
The order of acquiring LOCK_mysql_create_db
and wait_if_global_read_lock() was wrong. It could happen
that a thread held LOCK_mysql_create_db while waiting for
the global read lock to be released. The thread with the
global read lock could try to administrate a database too.
It would first try to lock LOCK_mysql_create_db and hang...

The check if the current thread has the global read lock
is done in wait_if_global_read_lock(), which could not be
reached because of the hang in LOCK_mysql_create_db.

Now I exchanged the order of acquiring LOCK_mysql_create_db
and wait_if_global_read_lock(). This makes 
wait_if_global_read_lock() fail with an error message for
the thread with the global read lock. No deadlock happens.
 2006-05-29 15:26:23 +02:00
elliot@mysql.com
fed637bfc0 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
 2006-05-29 09:21:53 -04:00
andrey@lmy004.
ea20259aac Merge lmy004.:/work/mysql-5.1-new-vanilla 
into lmy004.:/work/mysql-5.1-runtime
 2006-05-29 15:16:07 +02:00
msvensson@neptunus.(none)
076ddbf840 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-05-29 15:06:37 +02:00
msvensson@neptunus.(none)
3e2c08cc99 Update after merge to 5.0 2006-05-29 15:05:31 +02:00
msvensson@neptunus.(none)
20e0714176 Merge neptunus.(none):/home/msvensson/mysql/bug16297/my50-bug16297 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-05-29 13:16:17 +02:00
andrey@lmy004.
c9309583ee local variable interval to interval_tmp because it hides 
Event_timed::interval
 2006-05-29 13:12:34 +02:00
msvensson@neptunus.(none)
18bda1aff2 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-05-29 13:11:21 +02:00
andrey@lmy004.
b4752351f2 Fix for bug #17394 - Events namespace is wrong 2006-05-29 10:39:45 +02:00
serg@serg.mylan
60e3b61786 Incompatible ftparser plugin API change. 
mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
not a mysql_ftparam.
 2006-05-28 17:02:50 +02:00
serg@sergbook.mysql.com
71657322fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
 2006-05-28 14:54:28 +02:00
serg@sergbook.mysql.com
fe97dbb587 handlerton cleanup: 
duplicate fields removed, st_mysql_storage_engine added to support
run-time handlerton initialization (no compiler warnings), handler API
is now tied to MySQL version, handlerton->plugin mapping added
(slot-based), dummy default_hton removed, plugin-type-specific
initialization generalized, built-in plugins are now initialized too,
--default-storage-engine no longer needs a list of storage engines
in handle_options().

mysql-test-run.pl bugfixes
 2006-05-28 14:51:01 +02:00
igor@rurik.mysql.com
377b3e0306 Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX 
refers to a column name.
Added a new error message ER_INDEX_DOES_NOT_EXIST.
 2006-05-27 23:57:33 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cdc9025e0e Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
 2006-05-27 17:38:04 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
bd349cff14 BUG#19695: Showed partition options when table options were not shown 2006-05-27 17:36:45 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
10a7660f94 BUG#19305: COALESCE partition left partition files undropped 2006-05-27 16:34:13 -04:00
vtkachenko@vadima.volia.com
2e6b51579b Merge vtkachenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  vadima.volia.com:/root/mysql-5.1-new1
 2006-05-27 08:08:03 +03:00
vtkachenko@vadima.volia.com
ddc463494b sql_class.cc, mysql_priv.h: 
Added accessor to handler data.
 2006-05-27 08:05:39 +03:00
pekka@mysql.com
f9d9cc1575 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-05-27 05:03:47 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
90c415ffcd BUG#19122: MySQL Server crashes when ALTER TABLE t1 REBUILD PARTITION on InnoDB table 2006-05-26 18:44:52 -04:00
elliot@mysql.com
6f686a9ba0 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-release 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
 2006-05-26 17:18:20 -04:00
elliot@mysql.com
9ab5929eba BUG#15868 InnoDB thread thrashing 
Restoring default innodb_thread_concurrency to 8
This default now matches 5.0
 2006-05-26 17:11:21 -04:00
elliot@mysql.com
47f7438333 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/emurphy/iggy/mysql-5.0
 2006-05-26 15:00:09 -04:00
kent@mysql.com
51f3882243 Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.0
 2006-05-26 18:38:34 +02:00
rburnett@bk-internal.mysql.com
f4aa434fbe Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-26 15:08:24 +02:00
kent@mysql.com
7175805cd4 Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.1-new
 2006-05-26 13:17:09 +02:00
gkodinov@mysql.com
393d1b69e0 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kgeorge/mysql/5.0/clean
 2006-05-26 12:13:48 +03:00
gkodinov@mysql.com
b6acee915a Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18681
 2006-05-26 11:57:56 +03:00
gkodinov@mysql.com
7552d8d9ba Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18681
 2006-05-26 11:51:30 +03:00
gkodinov@mysql.com
f0f9c740ed Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B14875
 2006-05-26 11:51:11 +03:00
gkodinov@mysql.com
59837f7a5b Bug #14875: Bad view DEFINER makes SHOW CREATE VIEW fail 
When reading a view definition from a .frm file it was
throwing a SQL error if the DEFINER user is not defined.
Changed it to a warning to match the (documented) case
when a view with undefined DEFINER user is created.
 2006-05-26 11:49:39 +03:00
gkodinov@mysql.com
a21a2b5bcd BUG#18681: View privileges are broken 
The check for view security was lacking several points :
1. Check with the right set of permissions : for each table ref that
participates in a view there were the right credentials to use in it's
security_ctx member, but these weren't used for checking the credentials.
This makes hard enforcing the SQL SECURITY DEFINER|INVOKER property
consistently.
2. Because of the above the security checking for views was just ruled out
in explicit ways in several places.
3. The security was checked only for the columns of the tables that are
brought into the query from a view. So if there is no column reference
outside of the view definition it was not detecting the lack of access to
the tables in the view in SQL SECURITY INVOKER mode.

The fix below tries to fix the above 3 points.
 2006-05-26 11:47:53 +03:00
pekka@mysql.com
00cbeb84ec ndb - minor fix to unhandled error, already in 5.1 [ auto-incr ] 2006-05-25 21:27:56 +02:00
pekka@mysql.com
65f21e216b ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] v5.1 2006-05-25 20:00:36 +02:00
pekka@mysql.com
6ff1648d99 ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] 2006-05-25 18:00:55 +02:00
rburnett@bk-internal.mysql.com
61bd780166 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-25 17:47:26 +02:00
pekka@mysql.com
e929e28c7b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-05-25 16:20:36 +02:00
pekka@mysql.com
ae964cb4cc Merge mysql.com:/space/pekka/ndb/version/my51 
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
 2006-05-25 16:20:34 +02:00
gluh@mysql.com
023317d68a after merge fix 2006-05-25 19:20:34 +05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7f6afa8b2a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
 2006-05-25 10:20:33 -04:00
pekka@mysql.com
61057f6112 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-bug14509
 2006-05-25 13:14:16 +02:00
pekka@mysql.com
da807a85b9 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-bug14509
 2006-05-25 13:08:50 +02:00
ramil@mysql.com
bbb991e597 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b16900
 2006-05-25 16:05:55 +05:00
pekka@mysql.com
7fcc77f49c ndb - bug#14509 v5.1 part 2/2 : handler level 2006-05-25 12:13:47 +02:00
gkodinov@mysql.com
0336a34c7f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kgeorge/mysql/5.0/clean
 2006-05-25 13:12:57 +03:00
gkodinov@mysql.com
486837b0fa Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B19700
 2006-05-25 10:45:00 +03:00
gkodinov@mysql.com
d6b5a89044 Bug #19700: subselect returning BIGINT always returned it as SIGNED 
The unsigned flag in Item was not propagated through the single value subqueries.
This caused the result to be treated as signed.
 2006-05-25 10:39:18 +03:00
evgen@moonbone.local
d7e831ac62 sql_select.cc: 
After merge fix
 2006-05-25 00:03:35 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
701007fe30 review fix 2006-05-24 15:01:03 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ba75d18bec Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17455 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
 2006-05-24 13:56:23 -04:00
reggie@big_geek.
c492b58920 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt 
into  big_geek.:D:/work/mysql/mysql-5.1-vc71
 2006-05-24 12:46:45 -05:00
reggie@big_geek.
4a25f024ee some small fixups 2006-05-24 12:43:03 -05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
d1098a85eb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
 2006-05-24 13:41:04 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cb0a4f7423 BUG#19304: Merge handler not part of partitioned tables 
Review fix
 2006-05-24 13:35:52 -04:00
evgen@moonbone.local
516b8f0aca Manually merged 2006-05-24 20:52:57 +04:00
monty@mysql.com
4064f11acf Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-24 17:33:12 +03:00
monty@mysql.com
7cb3df0114 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-24 17:32:17 +03:00
monty@mysql.com
9e9ca8b6eb More DBUG statements 
Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads.
This fixes:
Bug#16986: Deadlock condition with MyISAM tables
Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock
 2006-05-24 17:21:35 +03:00
iggy@mysql.com
3cc64cef9a BUG#18669: Session COM_STATISTICS breaks mysqladmin status. 
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.
 2006-05-24 09:34:36 -04:00
elliot@mysql.com
15f763af84 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0-bug19394
 2006-05-24 09:02:55 -04:00
rburnett@bk-internal.mysql.com
9138f0ba6e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-24 14:57:44 +02:00
serg@mysql.com
c6abfd2f7f Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.1-release
 2006-05-24 14:37:18 +02:00
serg@mysql.com
c00edb8e8a Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
 2006-05-24 14:22:36 +02:00
svoj@april.(none)
551043b3df Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
 2006-05-24 16:59:27 +05:00
serg@mysql.com
1841c44cfc Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
 2006-05-24 12:19:39 +02:00
svoj@april.(none)
0674c702b0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
 2006-05-24 15:13:49 +05:00
monty@mysql.com
2a2da2f09b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-24 12:09:16 +03:00
monty@mysql.com
97b941d924 Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089) 
Fixed compiler warnings
Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490)
 2006-05-24 11:56:59 +03:00
holyfoot@deer.(none)
8485c574d9 bug #19650 (Embedded crashes in 5.1.10) 2006-05-24 13:28:24 +05:00
knielsen@mysql.com
b03168eb2f Fix missing source file. 2006-05-24 09:28:37 +02:00
brian@zim.(none)
5d9ec1ee82 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-23 19:08:28 -07:00
brian@zim.(none)
9368ab52f3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-23 17:33:12 -07:00
kent@mysql.com
97674810b0 don't let bugfix for bug#8303 break the bugfix for bug#8378 
revert the fix for bug#8303
correct the test for bug#8378
 2006-05-24 00:55:53 +02:00
jimw@mysql.com
e7c78a04eb Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-23 15:13:30 -07:00
cmiller@zippy.(none)
971dc90e3a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0--bug11151
 2006-05-23 15:01:05 -04:00
rburnett@bk-internal.mysql.com
37d1e803f1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-23 20:28:52 +02:00
brian@zim.(none)
b514d3a89c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-23 11:25:11 -07:00
msvensson@neptunus.(none)
f25fcf79a5 Bug#19938 Valgrind error (race) in handle_slave_sql() 2006-05-23 20:16:57 +02:00
kent@mysql.com
ade3de74d7 event_scheduler.h, event_scheduler.cc: 
Rename load_event() to load_named_event(), to avoid name clash on HP-UX
 2006-05-23 17:47:17 +02:00
jani@ua141d10.elisa.omakaista.fi
8dabbe3441 Removed wrong ascii codes from source code. 
Fixed core dump in --help
 2006-05-23 18:27:54 +03:00
msvensson@neptunus.(none)
0f1ae1305d Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-05-23 17:05:37 +02:00
andrey@lmy004.
046e77a2e5 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release
 2006-05-23 16:51:37 +02:00
andrey@lmy004.
a1c30e4877 __FUNCTION__ is not available everywhere. 
make us see at least with gcc the function proto. this can be extended
probably for windows too.
Fix build on intelxeon3 (sun compiler and others)
 2006-05-23 16:50:01 +02:00
msvensson@neptunus.(none)
cc9f33283d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-23 16:30:50 +02:00
cmiller@zippy.(none)
e700e84567 Guilhelm suggested that the "load data infile" command should be flagged as 
not transaction-safe for stored procedures.  Related to Bug#11151.
 2006-05-23 10:29:58 -04:00
msvensson@neptunus.(none)
12a47bf265 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-23 16:27:40 +02:00
msvensson@neptunus.(none)
6fb8f4f878 Bug #19938 Valgrind error (race) in handle_slave_sql() 2006-05-23 16:20:03 +02:00
msvensson@neptunus.(none)
ebedae2cb3 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143 2006-05-23 16:14:48 +02:00
msvensson@neptunus.(none)
4b51242460 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
 2006-05-23 14:39:30 +02:00
andrey@lmy004.
9670bb6ae4 Merge lmy004.:/work/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release-17619-try3
 2006-05-23 13:49:24 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
b756f55af0 BUG#17455: Wrong results from Repair/Optimize .. table for partitioned tables 2006-05-23 07:39:35 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0bd08dd4b6 BUG#19304: Merge handler allowed in partitioned tables 2006-05-23 07:37:03 -04:00
andrey@lmy004.
86052a9567 various fixes after push of fix for bug#17619 2006-05-23 13:32:22 +02:00
msvensson@neptunus.(none)
7b2e709fb7 Bug#16297 In memory grant tables not flushed when users's hostname is "" 
- In function 'handle_grant_struct' when searching the memory structures for an 
   entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
   with the host passed in argument "user_from".
 - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
   memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
   that "any host" can connect. Thus is's correct to turn on allow_all_hosts
   when such a user is found. 
 - Review and fix other places where host.hostname may be NULL.
 2006-05-23 11:35:14 +02:00
msvensson@neptunus.(none)
5e19424c00 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-05-23 10:36:06 +02:00
msvensson@neptunus.(none)
cb7958ce1b Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-05-23 10:34:59 +02:00
msvensson@neptunus.(none)
0144b51445 Add comment for 'kill_server' function 2006-05-23 10:33:53 +02:00
gluh@eagle.intranet.mysql.r18.ru
474ef8ed43 Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode 
transfer NO_DEFAULT_VALUE_FLAG flag to new field
 2006-05-23 13:27:45 +05:00
msvensson@neptunus.(none)
26face9f8b Bug#19938 Valgrind error (race) in handle_slave_sql() 
- Unlock the mutex after looking at rli->events_till_abort
 - Already fixed in 5.1 so it will be null merged.
 2006-05-23 10:20:57 +02:00
anozdrin@mysql.com
f0a01456e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
 2006-05-23 12:08:47 +04:00
gluh@eagle.intranet.mysql.r18.ru
457aea43fc Bug#16681 information_schema shows forbidden VIEW details 
show view definition to users that have the needed privilleges
 2006-05-23 12:45:25 +05:00
msvensson@neptunus.(none)
6571f513f4 Bug#20018 Class declared inside of function causes problem with gcc 2.95.3 
- Move class MY_HOOKS out of function
 2006-05-23 09:25:07 +02:00
andrey@lmy004.
30be755575 fix endianess on ppc. seems for sys_var_long_ptr we have to fetch 
var->save_result.ulonglong_value and not var->save_result.ulong_value
 2006-05-23 01:10:32 +02:00
andrey@lmy004.
ec0e9d5977 fix win32 build after push for bug#17619 2006-05-23 00:19:02 +02:00
andrey@lmy004.
3ced49d2f6 manual merged 2006-05-22 21:57:23 +02:00
andrey@lmy004.
b429d73d62 fix for bug #17619 Scheduler race conditions 
- Scheduler is either initialized at server start or never.
  Starting & stopping is now suspending & resuming.
- The scheduler has clear OO interface
- Now all calls to the scheduler are synchronous
- GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc)
- External API is encapsulated into class Events
- Includes fixes for all comments of Kostja's review of 19.05.2005

Starting to merge into 5.1-release (5.1.10) and push
 2006-05-22 20:46:13 +02:00
brian@zim.(none)
f99ce7ad62 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-22 11:40:29 -07:00
rburnett@bk-internal.mysql.com
179d483355 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-22 17:25:46 +02:00
igor@rurik.mysql.com
a6aaca7d6a Post-review fixes for bug #19089 2006-05-22 07:57:46 -07:00
mskold@mysql.com
cdccc77244 Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-05-22 15:16:37 +02:00
anozdrin@mysql.com
4a43bd1a3a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
 2006-05-22 14:22:58 +04:00
igor@rurik.mysql.com
4a27cbfd02 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-20 19:10:43 -07:00
igor@rurik.mysql.com
12e53358f0 Fixed bug #19089. 
When a CREATE TABLE command created a table from a materialized
view id does not inherit default values from the underlying table.
Moreover the temporary table used for the view materialization
does not inherit those default values.
In the case when the underlying table contained ENUM fields it caused
misleading error messages. In other cases the created table contained
wrong default values.
The code was modified to ensure inheritance of default values for
materialized views.
 2006-05-20 18:54:43 -07:00
kent@mysql.com
5c69c5b164 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-20 09:49:03 +02:00
jimw@mysql.com
8262c3c38e Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-19 19:07:33 -07:00
jimw@mysql.com
2b13192c2e Merge mysql.com:/home/jimw/my/mysql-5.0-1039 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-19 16:17:24 -07:00
kent@mysql.com
d0f40d7d72 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-20 00:09:08 +02:00
tomas@poseidon.ndb.mysql.com
00188154c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-19 23:20:33 +02:00
tomas@poseidon.ndb.mysql.com
83c095ba5c ha_ndbcluster_binlog.cc: 
ndb: fix compile error on solaris
 2006-05-19 20:31:02 +02:00
iggy@mysql.com
2cae56794c BUG#19322 Added help defintion for --skip-external locking to mysqld --help --verbose 2006-05-19 13:17:07 -04:00
tomas@poseidon.ndb.mysql.com
d76b071efe ndb: moved startup order back for ndb binlog thread from previous push that seems to be causing startup issues 2006-05-19 18:11:47 +02:00
tomas@poseidon.ndb.mysql.com
4183ab6d49 Bug #19885 master1 crash in ndb_condition_pushdown test 
- record structure wrongly deallocated during online alter on remote mysqld
- change so that ndb handler allocates the buffer itself, so it can be reused after alter
 2006-05-19 17:34:50 +02:00
rburnett@bk-internal.mysql.com
327a77b22f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-19 16:39:37 +02:00
tomas@poseidon.ndb.mysql.com
0ba9208933 ndb: changed to use mem root to allocate table structure for ndb share 2006-05-19 15:44:46 +02:00
anozdrin@mysql.com
64166ebf27 1. Fix compilation on Windows; 
2. Fix trigger.test.
 2006-05-19 16:01:04 +04:00
kent@mysql.com
de7e522fda Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-19 14:00:30 +02:00
msvensson@neptunus.(none)
b53548fe10 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-19 14:00:30 +02:00
sergefp@mysql.com
49e23937e4 Merge mysql.com:/home/psergey/tmp_merge 
into  mysql.com:/home/psergey/mysql-5.1-merge
 2006-05-19 16:00:29 +04:00
msvensson@devsrv-b.mysql.com
49eeb1bb57 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
 2006-05-19 13:16:06 +02:00
msvensson@neptunus.(none)
e3a75df3ca Merge bk-internal:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-05-19 13:11:49 +02:00
msvensson@neptunus.(none)
d04113db05 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-05-19 13:10:52 +02:00
msvensson@neptunus.(none)
f186a3f24e Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-05-19 13:09:15 +02:00
msvensson@neptunus.(none)
b9a59fa014 Bug#15869 Cannot shutdown the server - it restarts 
- A segfault occured when the function 'kill_server' called 
   'my_sigset' with signal number 0. 'my_sigset' is a macro which
   uses 'sigaction' to install the signal handler with an invalid
   signal number will on most platforms return EINVAL but yields
   a segfauilt on IRIX 6.5
 - The server crash was detected by mysqld_safe and it was restarted although
   a shutdown was requested. 
 - Semantics of kill_server(0) is not known, leaving it intact
 2006-05-19 13:07:24 +02:00
tomas@poseidon.ndb.mysql.com
148faca833 Bug #19395 mysqld does not always detect cluster shutdown 2006-05-19 12:54:12 +02:00
tomas@poseidon.ndb.mysql.com
d0fd5ecde8 Bug #19395 mysqld does not always detect cluster shutdown 
Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
 2006-05-18 23:38:07 +02:00
igor@rurik.mysql.com
710d422404 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-05-18 13:17:59 -07:00
lars@mysql.com
399a1b845b After merge fixes 2006-05-18 21:40:52 +02:00
igor@rurik.mysql.com
3b3e6ecb95 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2006-05-18 11:30:42 -07:00
brian@zim.(none)
f373c81ac8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-18 11:23:21 -07:00
kent@mysql.com
35440889d9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-18 19:55:27 +02:00
jimw@mysql.com
7d54b004a2 Bug #13975: "same string" + 0 has 2 different results 
The 'decimals' member of Item_func was being improperly initialized,
  which resulted in improper results when handling large numeric values.
 2006-05-18 10:34:01 -07:00
lars@mysql.com
87bb4f95ea Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-05-18 18:38:50 +02:00
msvensson@neptunus.(none)
38f2749053 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-18 18:29:07 +02:00
msvensson@neptunus.(none)
1eadbaa652 Fix "glibc detected double free" 
Remove extra call to vio_end
 2006-05-18 18:11:54 +02:00
rburnett@bk-internal.mysql.com
da6e25d86d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-18 17:24:29 +02:00
anozdrin@mysql.com
c1113af15c This is an implementation of two WL items: 
- WL#3158: IM: Instance configuration extensions;
  - WL#3159: IM: --bootstrap and --start-default-instance modes

The following new statements have been added:
  - CREATE INSTANCE;
  - DROP INSTANCE;

The behaviour of the following statements have been changed:
  - SET;
  - UNSET;
  - FLUSH INSTANCES;
  - SHOW INSTANCES;
  - SHOW INSTANCE OPTIONS;
 2006-05-18 18:57:50 +04:00
evgen@moonbone.local
894092becf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/19077-bug-5.0-mysql
 2006-05-18 16:01:13 +04:00
knielsen@mysql.com
339afc620f After-merge fix. 2006-05-18 13:35:15 +02:00
knielsen@mysql.com
a061c90d8a Merge mysql.com:/usr/local/mysql/tmp_merge 
into  mysql.com:/usr/local/mysql/merge-5.1
 2006-05-18 11:56:50 +02:00
gbichot@dl145j.mysql.com
dada106458 Merge gbichot@bk-internal:/home/bk/mysql-5.1-new 
into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
 2006-05-18 10:08:43 +02:00
holyfoot@mysql.com
812d152107 Merge bk@192.168.21.1:mysql-5.1-kt 
into mysql.com:/home/hf/work/mysql-5.1.14573
 2006-05-18 12:09:32 +05:00
igor@rurik.mysql.com
1802e6895a Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2006-05-17 20:56:52 -07:00
igor@rurik.mysql.com
9ec8101813 Fixed bug #19816. 
This bug was introduced when the patch resolving the
performance problem 17164 was applied. As a result
of that modification the not_null_tables attributes
were calculated incorrectly for constant OR conditions.
This triggered invalid conversion of outer joins into
inner joins.
 2006-05-17 20:48:48 -07:00
igor@rurik.mysql.com
0d069edaa2 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-05-17 17:20:03 -07:00
kent@mysql.com
cd1bc46cf9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-18 01:10:09 +02:00
kent@mysql.com
d48e55eefd Merge 2006-05-17 23:41:56 +02:00
kent@mysql.com
5842dcaa7d Merge mysql.com:/data0/mysqldev/my/tmp_merge 
into  mysql.com:/tmp/mysql-5.1-new
 2006-05-17 23:35:08 +02:00
evgen@moonbone.local
1d820585ae Fixed bug#19077: A nested materialized derived table is used before being populated. 
The convert_constant_item() function converts constant items to ints on
prepare phase to optimize execution speed. In this case it tries to evaluate
subselect which contains a derived table and is contained in a derived table. 
All derived tables are filled only after all derived tables are prepared.
So evaluation of subselect with derived table at the prepare phase will
return a wrong result.

A new flag with_subselect is added to the Item class. It indicates that
expression which this item represents is a subselect or contains a subselect.
It is set to 0 by default. It is set to 1 in the Item_subselect constructor
for subselects.
For Item_func and Item_cond derived classes it is set after fixing any argument
in Item_func::fix_fields() and Item_cond::fix_fields accordingly.
The convert_constant_item() function now doesn't convert a constant item
if the with_subselect flag set in it.
 2006-05-18 00:55:28 +04:00
gbichot@dl145j.mysql.com
09a1fca4a6 Merge bk://localhost:5556 
into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
 2006-05-17 22:43:47 +02:00
guilhem@mysql.com
c1b11edfac Removing the binlog-show-xid option as it was only a temporary solution until we have replace-regex which we have now. 
That option was used to suppress the XID from the output of SHOW BINLOG EVENTS (to create a repeatable testsuite),
was available only in debug builds, and was explicitely marked as "may be removed in future versions" in mysqld --help.
Idea of the removal approved by the replication team.
 2006-05-17 22:16:51 +02:00
igor@rurik.mysql.com
62f61f527f Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-05-17 11:46:21 -07:00
lars@mysql.com
321db8e349 After merge fixes 2006-05-17 15:57:45 +02:00
lars@mysql.com
7cbba084d7 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
 2006-05-17 15:14:07 +02:00
knielsen@mysql.com
bf153b66a3 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-05-17 15:09:40 +02:00
holyfoot@mysql.com
e5f04160d5 Merge bk@192.168.21.1:mysql-5.1-kt 
into mysql.com:/home/hf/work/mysql-5.1.14573
 2006-05-17 17:12:25 +05:00
pekka@mysql.com
e10998672b Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
 2006-05-17 12:56:59 +02:00
pekka@mysql.com
54963c2e52 ndb - bug#14509 [related] re-do auto-incr error handling 2006-05-17 12:40:10 +02:00
gkodinov@mysql.com
9f9a76eb6e Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge 
into  mysql.com:/home/kgeorge/mysql/5.1/merge
 2006-05-17 13:29:20 +03:00
tomas@poseidon.ndb.mysql.com
0cb31d7d5f Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 2006-05-17 08:34:48 +02:00
igor@rurik.mysql.com
767d25dabd Fixed bug #19573. 
The select statement that specified a view could be
slightly changed when the view was saved in a frm file.
In particular references to an alias name in the HAVING
clause could be substituted for the expression named by
this alias.
This could result in an error message for a query of
the form SELECT * FROM <view>. Yet no such message
appeared when executing the query specifying the view.
 2006-05-16 22:19:44 -07:00
kent@mysql.com
9fca0d766b mysql.spec.sh: 
Removed Berkeley DB
configure.in:
  Adjusted Netware support
basic.t.c:
  Change for Netware
Makefile.am:
  Use thread safe libmysqlclient_r if it was built
valgrind.supp:
  Hide report about strlen/_dl_init_paths
ha_tina.cc:
  Temporarely disable CSV engine on Netware,
  as the engine depends on mmap()
net_serv.cc:
  Include <sys/select.h> for Netware
 2006-05-16 22:47:22 +02:00
tulin@production.mysql.com
b3d8b9bbd8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/tulin/mysql-5.0
 2006-05-16 21:46:00 +02:00
tomas@poseidon.ndb.mysql.com
c5987ab67a Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 
- adoptions to handle binlog
 2006-05-16 20:56:45 +02:00
konstantin@mysql.com
1e6c14d687 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-05-16 18:26:25 +04:00
svoj@april.(none)
3afbfc5fed BUG#17001 - Table and server crash on ALTER TABLE 
frm and data files for tables created by earlier MySQL
versions becomes out of sync after certain ALTER TABLE statements:
- One that changes column default value;
- One that changes table comment;
- One that changes table password.

As a result one can expirience either server crash or data corruption/loss.

This fix ensures that running ALTER TABLE on tables created by earlier
MySQL versions recreates data files.
 2006-05-16 18:37:23 +05:00
knielsen@mysql.com
a729d7fcdd Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-05-16 14:34:35 +02:00
sergefp@mysql.com
c89fc77116 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug19618
 2006-05-16 15:34:23 +04:00
pekka@mysql.com
852c0dbf64 Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
 2006-05-16 13:13:50 +02:00
pekka@mysql.com
dd58dd51a1 ndb - bug#14509 [related] setAutoIncrement: add error handling 2006-05-16 12:58:41 +02:00
tomas@poseidon.ndb.mysql.com
b467bdfcdb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-05-16 12:33:24 +02:00
tomas@poseidon.ndb.mysql.com
a5686c3138 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-05-16 12:32:36 +02:00
konstantin@mysql.com
92beab466d Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-05-16 13:57:43 +04:00
sergefp@mysql.com
b7c52881d1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug19618
 2006-05-16 13:46:30 +04:00