mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-11 17:48:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32183 commits 2852 branches 349 tags 1.6 GiB
Commit graph

32183 commits

Author SHA1 Message Date
georg@lmy002.wdf.sap.corp
556fbe7d68 fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) 
(approved by kostja)
 2006-03-21 22:02:36 +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)
31b52662a1 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-21 18:50:27 +01:00
lars@mysql.com
20290ee5f6 Made rpl_flushlog_loop use wait_slave_status instead of sleep. 
This to save 5 seconds of test time.
More test to follow. :-)
 2006-03-21 17:40:51 +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)
1878f79bba Merge neptunus.(none):/home/msvensson/mysql/bug18310/my50-bug18310 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-21 17:14:49 +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 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
tomas@poseidon.ndb.mysql.com
bdc3f48545 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 12:34:45 +01:00
tomas@poseidon.ndb.mysql.com
c9c0a6d690 disabled undeterministic test 2006-03-21 12:33:13 +01:00
msvensson@neptunus.(none)
821e501fc7 Merge neptunus.(none):/home/msvensson/mysql/bug18310/my50-bug18310 
into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310
 2006-03-21 11:24:15 +01:00
msvensson@neptunus.(none)
dcd5e17264 Use yaSSL as default for BUILD/* scripts 2006-03-21 11:21:52 +01: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
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
f9075c0732 BUG#17754 
Fixed result files
 2006-03-20 21:46:16 -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
msvensson@neptunus.(none)
8ca012aefb Don't look for "dlopen" if server linked with -static or -all-static flag. Update after review 2006-03-20 19:55:38 +01:00
holyfoot@vva.(none)
28834f4466 merging 2006-03-20 19:37:44 +04:00
holyfoot@mysql.com
fc94004a65 merging 2006-03-20 19:22:56 +04:00
tomas@poseidon.ndb.mysql.com
2c991eec59 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-20 16:05:09 +01:00
tomas@poseidon.ndb.mysql.com
9da0e8f5b4 ndb: added debug printout 2006-03-20 16:03:35 +01: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
holyfoot@vva.(none)
a68742f460 bug (sp with delete, create and rollback causes MySQLD core) 
additional fixes
 2006-03-20 17:30:01 +04:00
bar@mysql.com
da8a68b4ca Bug#17374: select ... like 'A%' operator fails to find value on columuns with key 
Fixed that LIKE worked case insensitively for latin2_czech_cs,
which was wrong for a case sensitive collation.
 2006-03-20 16:28:25 +04:00
holyfoot@mysql.com
87a4e300a1 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.clean
 2006-03-20 15:24:14 +04:00
bar@mysql.com
2e7cf881ac Bug XML: Extractvalue() accepts mallformed 
XPath without a XPath syntax error
item_xmlfunc.cc:
  Error message didn't happen because after
  a failing attempt to parse RelativeLocationPath,
  my_xpath_parse_AbsoluteLocationPath() returned success.
  Changeing logic a bit:
  - Try to parse EOF first, return success if true.
  - Then try to parse RelativeLocationPath(), return success if true.
  - Otherwise return failure.
xml.result:
  Adding test case.
  Also, this change made it possible to generate 
  an error message earlier in the case of another
  bad XPATH syntax.
xml.test:
  Adding test case.
 2006-03-20 14:57:34 +04:00
bar@mysql.com
33e446b356 Bug#18004 Connecting crashes server when default charset is UCS2 
table.cc:
  Fixing to use system_charset_info instead of default_charset_info.
  Crash happened because the "ctype" array is empty in UCS2,
  and thus cannot be used with my_isspace().
  The reason why UCS2 appeared in this context was because of
  of default_charset_info variable incorrectly substituted to my_isspace().
  As functions check_db_name(), check_table_name() and check_column_name()
  always get values in utf8, system_charset_info must be used instead.
ctype_ucs2_def.test, ctype_ucs2_def-master.opt, ctype_ucs2_def.result:
  new file
 2006-03-20 14:43:02 +04:00
msvensson@shellback.(none)
3c3654613a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-20 11:20:13 +01:00
gluh@eagle.intranet.mysql.r18.ru
f78ae59f0f Fix for bug#18224 VIEW on information_schema crashes the server 
additional check for subselect
 2006-03-20 14:17:47 +04:00
gluh@eagle.intranet.mysql.r18.ru
a184a00eae Fix for bug "SELECT * FROM information_schema.xxx crashes server" 
Crash happened when one selected data from one of INFORMATION_SCHEMA
tables and in order to build its contents server had to open view which
used stored function and table or view on which one had not global or
database-level privileges (e.g. had only table-level or had no
privileges at all).

The crash was caused by usage of check_grant() function, which assumes
that either number of tables to be inspected by it is limited explicitly
or table list used and thd->lex->query_tables_own_last value correspond
to each other (the latter should be either 0 or point to next_global
member of one of elements of this table list), in conditions when
above assumptions were not true. This fix just explicitly limits
number of tables to be inspected. Other negative effects which are
caused by the fact that thd->lex->query_tables_own_last might not
be set properly during processing of I_S tables are less disastrous
and will be reported and fixed separetely.
 2006-03-20 13:42:02 +04:00
knielsen@mysql.com
95242e7186 Fix HPUX compilation. 2006-03-20 09:35:56 +01:00
hartmut@mysql.com
3b34159891 Merge mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1/gcc41
 2006-03-18 18:21:48 +01:00