mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32130 commits 2781 branches 343 tags 1.6 GiB
Commit graph

32130 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
86f3d2d08a Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.
 2006-03-23 14:14:32 +04:00
unknown
1b58717cd8 Bug#15376: Unassigned multibyte codes are converted to U+0000 
Mergeing changes into 5.0


mysql-test/r/ctype_eucjpms.result:
  Adding test
mysql-test/r/ctype_ujis.result:
  After merge fix
mysql-test/t/ctype_eucjpms.test:
  Adding test
strings/ctype-cp932.c:
  After merge fix
strings/ctype-eucjpms.c:
  Applying changes to eucjpms, similar to ujis.
  Note: eucjpms appeared in 5.0 so the original patch,
  which was for for 4.1, didn't fix eucjpms.
 2006-03-23 14:03:39 +04:00
unknown
1f129403af m_ctype.h: 
Removing duplicate old definition.
  After merge fix for bug#15375


include/m_ctype.h:
  Removing duplicate old definition.
  After merge fix for bug#15375
 2006-03-23 13:05:13 +04:00
unknown
8c8e0567c7 Merge mysql.com:/usr/home/bar/mysql-4.1.b15376 
into  mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.
mysql-test/r/ctype_ujis.result:
  After merge fix
 2006-03-23 12:41:28 +04:00
unknown
c7df2c6a58 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 12:27:23 +04:00
unknown
5b34888ce4 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-23 12:27:10 +04:00
unknown
2dfd0fa633 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new


sql-common/client.c:
  Auto merged
 2006-03-23 12:22:39 +04:00
unknown
b31eca1e52 ctype-czech.c: 
Fixing wrong min_sort_char.


strings/ctype-czech.c:
  Fixing wrong min_sort_char.
 2006-03-23 12:15:13 +04:00
unknown
763b4f47d0 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 08:51:24 +01:00
unknown
6d7711660c Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-23 08:23:33 +01:00
unknown
47cee5bf9a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/parse_file.cc:
  Auto merged
 2006-03-23 08:22:11 +01:00
unknown
c3e7925f72 Move the replcae result to before the correct select 2006-03-23 08:21:16 +01:00
unknown
cea5dcf683 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 10:25:04 +04:00
unknown
abbc7e2d3b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-23 10:20:40 +04:00
unknown
c25669a810 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
 2006-03-23 10:19:55 +04:00
unknown
859aa2f24f Merge mysql.com:/usr/home/bar/mysql-4.1.b17374 
into  mysql.com:/usr/home/bar/mysql-5.0


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
 2006-03-23 10:17:31 +04:00
unknown
3e6330e783 Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and 
5.0.18 by not reseting or accessing the info_buffer member
 2006-03-23 00:37:40 +02:00
unknown
0003994a5f Fix unused variable warning 
sql/parse_file.cc:
  Remove unused variable
 2006-03-22 22:37:32 +01:00
unknown
40e480245d Save core files before removing the data_dir 2006-03-22 22:34:48 +01:00
unknown
5ae7cf461e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 18:12:10 +01:00
unknown
8e46f6409c 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 18:12:09 +01:00
unknown
b39ee4ffa1 ndb: added debug printout to track down a bug 2006-03-22 18:10:56 +01:00
unknown
9c2bf06651 Changed to real_sleep 2006-03-22 17:28:48 +01:00
unknown
e03b3b7d33 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 17:28:47 +01:00
unknown
2e24e37845 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 17:28:46 +01:00
unknown
f81a6dbe98 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 17:28:46 +01:00
unknown
dfa9a76411 ndb: removed TransporterFacade singleton 2006-03-22 17:28:45 +01:00
unknown
dec3dff235 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-22 16:52:31 +01:00
unknown
7e78842adf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
 2006-03-22 16:48:35 +01:00
unknown
d4eeb4eefd Fix windows results using "replace_result" 2006-03-22 16:47:45 +01:00
unknown
0fcf49b448 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
 2006-03-22 16:06:34 +01:00
unknown
5c207e336d changed comment in disabled.def 2006-03-22 16:04:38 +01:00
unknown
d410ef5865 continued: 
ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour
 2006-03-22 15:56:53 +01:00
unknown
9aae1afbbb Bug#18071 Result from MATCH() uses too many decimals 
- Use FORMAT as a workaround to only output the first 6 decimals of the value returned
from MATCH
 - This has been done before


mysql-test/r/fulltext.result:
  Use FORMAT to only output the first 6 decimals from MATCH
mysql-test/t/fulltext.test:
  Use FORMAT to only output the first 6 decimals from MATCH
 2006-03-22 14:57:24 +01:00
unknown
4ab459ce79 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new


sql/table.cc:
  Auto merged
 2006-03-22 15:10:42 +04:00
unknown
0adda6df52 Dsiable udf.test waiting for a check wheter udf_example.so exists 
mysql-test/include/have_udf.inc:
  Add comment that a check for udf_example.so must be made
mysql-test/t/disabled.def:
  Disable udf.test
 2006-03-22 12:03:15 +01:00
unknown
104f2c0c99 ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour 2006-03-22 11:45:14 +01:00
unknown
4b6ac944fe 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 11:13:29 +01:00
unknown
578bd3e44d 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
unknown
76313a555c corrected previous patch 2006-03-22 10:54:55 +01:00
unknown
16acc6a5bd Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 10:50:46 +01:00
unknown
07627827e9 added config parameter InitialNoOfOpenFiles 2006-03-22 10:17:29 +01:00
unknown
4399da26b4 Merge mysql.com:/usr/home/bar/mysql-4.1.b18004 
into  mysql.com:/usr/home/bar/mysql-5.0


sql/table.cc:
  Auto merged
 2006-03-22 13:11:31 +04:00
unknown
187ff69509 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
unknown
64dc3289de item_xmlfunc.cc: 
After review fix.
  Thanks to Gluh for suggestion.
  Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error


sql/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
unknown
0cfbdc4e00 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
unknown
e0f76370b2 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 08:42:45 +01:00
unknown
e959d2f451 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
 2006-03-22 07:59:55 +01:00
unknown
6d25c52f58 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/mysql_priv.h:
  Auto merged
 2006-03-22 07:57:56 +01:00
unknown
97aefffbf2 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.1
 2006-03-22 05:51:12 +01:00