1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Commit Graph

15202 Commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
d0a3ce5da4 - corrected bug causing hang in getTable when using blob tables
- make sure cluster/schema table is always created first
2006-03-24 10:12:34 +01:00
brian@zim.(none)
8eab1ba028 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-03-23 15:04:45 -08:00
tomas@poseidon.ndb.mysql.com
5cc1da5424 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-23 22:50:20 +01:00
tomas@poseidon.ndb.mysql.com
57198f85d6 Bug #18472 race condition between multiple mysqld's when setting up cluster/schema
- check that event is the correct one, and only delete if wrong version
2006-03-23 22:49:02 +01:00
brian@zim.(none)
9fc9d0f282 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-03-23 08:46:26 -08:00
bar@mysql.com
add4b40ebe Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 19:59:21 +04:00
brian@zim.(none)
aced117538 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-03-23 05:52:34 -08:00
brian@zim.(none)
bdfb7180ca Refactored some code to remove ifdef and removed dead code related to un-useable sync code. 2006-03-23 05:51:31 -08:00
pekka@mysql.com
c54b8647d4 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/export/space/pekka/ndb/version/my51
2006-03-23 11:35:54 +01:00
bar@mysql.com
b2b020b318 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 14:14:32 +04:00
bar@mysql.com
1008146d86 Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
into  mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 12:41:28 +04:00
msvensson@neptunus.(none)
ba2ddc869c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-23 08:22:11 +01:00
pekka@mysql.com
a2263a1fbf ndb - bug#17813 schema.query => blob 2006-03-23 04:59:14 +01:00
msvensson@neptunus.(none)
465b2d38db Fix unused variable warning 2006-03-22 22:37:32 +01:00
tomas@poseidon.ndb.mysql.com
615699a82e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-22 16:06:34 +01:00
bar@mysql.com
d735a60964 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-22 15:10:42 +04:00
tomas@poseidon.ndb.mysql.com
940d0e8757 ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour 2006-03-22 11:45:14 +01:00
msvensson@neptunus.(none)
89a5b96ee4 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-22 11:12:28 +01:00
bar@mysql.com
cab060d2e2 Merge mysql.com:/usr/home/bar/mysql-4.1.b18004
into  mysql.com:/usr/home/bar/mysql-5.0
2006-03-22 13:11:31 +04:00
bar@mysql.com
235c5d35a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18172
2006-03-22 13:01:16 +04:00
bar@mysql.com
1ddf3c2705 item_xmlfunc.cc:
After review fix.
  Thanks to Gluh for suggestion.
  Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error
2006-03-22 12:57:41 +04:00
tomas@poseidon.ndb.mysql.com
1dc65faf16 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-22 09:36:53 +01:00
msvensson@neptunus.(none)
ffe694b831 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-22 07:57:56 +01:00
mats@mysql.com
75834b6e01 Merge mysql.com:/home/bkroot/mysql-5.0
into  mysql.com:/home/bk/b18293-mysql-5.1-new
2006-03-21 20:17:28 +01:00
msvensson@neptunus.(none)
dcceaae8b6 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-21 20:08:25 +01:00
msvensson@neptunus.(none)
91197c354b Merge neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-21 20:05:55 +01:00
msvensson@neptunus.(none)
ede2943ea0 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-21 18:51:47 +01:00
msvensson@neptunus.(none)
033059d5b4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310
2006-03-21 17:19:02 +01:00
msvensson@neptunus.(none)
81f83e5c0a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310
2006-03-21 17:15:55 +01:00
msvensson@neptunus.(none)
b248885b02 Bug#18310 Server compiled with yassl crash
- Add protection so that 'show_ssl_get_cipher_list' does not write after end of "buff"
2006-03-21 17:02:46 +01:00
tomas@poseidon.ndb.mysql.com
f9c16f2682 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-21 16:56:11 +01:00
tomas@poseidon.ndb.mysql.com
bd9f9533fb Bug #18395 dual mysqld's with binlog do not sync drop table binlog event correctly
- in ndb_binlog_thread_handle_schema_event make sure to postpone "slock achnowledgement" until event has been put into the binlog

+ some cleanup, Cluster_replication_schem -> Cluster_schema, indentation
2006-03-21 16:54:56 +01:00
mats@mysql.com
7351d35693 Merge mysql.com:/home/bkroot/mysql-5.0
into  mysql.com:/home/bk/b18293-mysql-5.0
2006-03-21 14:37:41 +01:00
mats@mysql.com
1d4ee057ee BUG#18293 (Values in stored procedures written to binlog unescaped):
Generating character set-independent quoting of strings for the
binary log when executing statements from inside stored procedure.
2006-03-21 14:35:49 +01:00
gluh@mysql.com
c9d4d6aa29 5.0 -> 5.1 merge 2006-03-21 16:26:47 +04:00
msvensson@neptunus.(none)
dc749e9ad7 Bug#11835 CREATE FUNCTION crashes server
- Update for 5.1
 - Add "have_dlopen"
 - Remove requirement to load udf's only in "opt_plugin_dir"
2006-03-21 10:54:26 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
7432108f46 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-21 00:00:19 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
86086e7193 Manual merge 2006-03-20 23:55:10 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
4d2b8f8ef6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-20 22:47:48 -05:00
msvensson@neptunus.(none)
1d953c313e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
2006-03-20 22:57:18 +01:00
knielsen@mysql.com
3e7d8a78db Fix compilation failure when compiling without partitioning, introduced
by previous push.
2006-03-20 21:57:23 +01:00
msvensson@neptunus.(none)
4064528279 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
2006-03-20 21:41:27 +01:00
msvensson@neptunus.(none)
0811648e31 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
2006-03-20 21:35:05 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
738176c15f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-20 14:41:50 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd77396a94 BUG#17754
Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning
2006-03-20 14:36:21 -05:00
msvensson@neptunus.(none)
f12b979fb1 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
2006-03-20 20:16:53 +01:00
holyfoot@mysql.com
fc94004a65 merging 2006-03-20 19:22:56 +04:00
gluh@eagle.intranet.mysql.r18.ru
820731c6ed Fix for bug#15336 Partitions: crash if create table as select
added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()
2006-03-20 18:58:21 +04:00
holyfoot@vva.(none)
936d596abc Code #ifdef-ed 2006-03-20 18:46:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
c0420a5c5e Bug#14367 Partitions: crash if utf8 column
use part_info->item_free_list instead of thd->free_list during partition function parsing
2006-03-20 17:41:45 +04:00