Alexander Barkov
c15f970dc8
WL#1349 Use operating system localization to send it as a default client character set
2009-10-21 17:59:47 +05:00
Alexander Barkov
d850a57c3b
Bug#46633 Obsolete Serbian locale name
...
- Renaming sr_YU to sr_RS
- Adding test case
2009-10-19 12:52:29 +05:00
Alexander Barkov
de7d1abe93
A postfix for WL#751
2009-10-16 13:47:34 +05:00
Sergey Glukhov
d8c3f2263f
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
Alexander Barkov
3929dddcd7
Backporting WL#4164 Two-byte collation IDs
2009-10-15 15:17:32 +05:00
Alexander Barkov
4def52165d
A postfix for backporting WL#1397 convert XML -> SQL
...
mysql-test/r/loadxml.result
mysql-test/t/loadxml.test
Fixing non-deterministic test results
sql/sql_yacc.yy
Initializing fname_first using get_tok_end() instead of get_ptr().
The latter is grammar-dependant. The former is not.
2009-10-14 17:10:22 +05:00
Alexander Barkov
93c885bd36
WL#1397 convert XML -> SQL
2009-10-12 11:22:53 +05:00
Alexander Nozdrin
829525756e
Merge from mysql-next-mr.
2009-10-10 19:22:31 +04:00
Alexander Nozdrin
c4aab48095
Merge. Backport WL#4085 from 6.0.
2009-10-10 19:19:12 +04:00
Alexander Nozdrin
dea2a8daee
Merge from mysql-trunk.
2009-10-09 19:56:30 +04:00
Alexander Nozdrin
eddd727a3a
Update version in default.conf.
2009-10-09 19:54:56 +04:00
Alexander Nozdrin
d8521d6575
Merge from mysql-next-mr-alik (WL#4085).
2009-10-09 17:10:13 +04:00
Alexander Nozdrin
5db160c884
Merge from mysql-next-mr.
2009-10-09 17:09:16 +04:00
Alexander Nozdrin
0c3e1aa157
Merge from mysql-next-mr.
2009-10-09 17:05:11 +04:00
Alexander Nozdrin
798cbaa22a
Merge from mysql-trunk.
2009-10-09 13:23:23 +04:00
Alexander Nozdrin
a8b2c0585c
Change the version tag (to 5.5.0).
2009-10-09 13:22:26 +04:00
Alexander Nozdrin
09cdd045dc
Merge from mysql-trunk.
2009-10-09 12:56:39 +04:00
Alexander Nozdrin
f6e3ec53c7
Fix default.cof.
2009-10-09 12:48:08 +04:00
Alexander Nozdrin
a89855c537
Merge from mysql-trunk-bugfixing.
2009-10-09 12:30:34 +04:00
Alexander Nozdrin
1031d8e7f1
Mark main.log_tables experimental (Bug 47924).
2009-10-08 23:13:33 +04:00
Alexander Nozdrin
4efe5b948a
Merge from mysql-trunk-bugfixing.
2009-10-08 13:29:48 +04:00
Alexander Nozdrin
6e5f97e150
Fix index_merge_innodb.result (Bug 45727).
2009-10-08 13:27:45 +04:00
Alexander Nozdrin
01b455d84e
Merge from mysql-next-mr.
2009-10-08 11:42:38 +04:00
Alexander Nozdrin
1733a974b4
Merge from mysql-trunk-bugfixing.
2009-10-07 19:42:50 +04:00
Alexander Nozdrin
f6dddce2ff
Disabled index_merge2.inc due to Bug 45727.
2009-10-07 19:37:36 +04:00
Alexander Nozdrin
21916790a1
Backport WL#4085: Merge revno:2617.56.29 from 6.0.
2009-10-06 14:57:07 +04:00
Alexander Nozdrin
682eb07ad6
Merge revno:2617.31.54 from 6.0.
2009-10-06 14:56:23 +04:00
Alexander Nozdrin
0191eb8d3e
Backport WL#4085: Merge revno:2476.1338.9 from 6.0.
2009-10-06 14:53:47 +04:00
Alexander Nozdrin
aea063c2dc
Backport WL#4085: Merge revno:2476.1105.1 from 6.0.
2009-10-06 14:52:26 +04:00
Alexander Nozdrin
068d170b3c
Backport WL#4085: Merge revno:2476.657.219 from 6.0.
2009-10-06 14:47:04 +04:00
Alexander Barkov
f628035317
Bsckporting WL#3764 Sinhala Collation
...
modified:
mysql-test/r/ctype_utf8.result
mysql-test/t/ctype_utf8.test
mysys/charset-def.c
strings/ctype-uca.c
2009-10-06 15:34:49 +05:00
Alexander Barkov
27936529e0
Backporting WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT
...
added:
mysql-test/r/locale.result
mysql-test/t/locale.test
modified:
mysql-test/r/variables.result
mysql-test/t/variables.test
sql/sql_locale.cc
2009-10-06 11:02:51 +05:00
Guilhem Bichot
56312dc7cf
Backport of the fix for BUG#33730 "Full table scan instead selected partitions for query more than 10 partitions"
...
from 6.0, made in sergefp@mysql.com-20090205190644-q8632sniogedhtsu
2009-10-05 22:59:19 +02:00
Alexander Barkov
636ea6a1c4
WL#4584 Internationalized number format
...
@ mysql-test/r/func_str.result
Adding tests
@ mysql-test/t/func_str.test
Adding tests
@ mysql-test/t/variables.test
Fixing error number
@ sql/item_create.cc
Allowing 2 and 3 arguments to format()
@ sql/item_strfunc.cc
Adding new formatting code.
@ sql/item_strfunc.h
Adding new contructors and "locale" member
@ sql/mysql_priv.h
Adding number formatting members into MY_LOCALE
@ sql/sql_locale.cc
Adding number formatting data into locale constants
@ sql/set_var.cc
Using new error message
@ sql/share/errmgs.txt
Adding new error message
2009-10-05 20:06:04 +05:00
Guilhem Bichot
42e8077834
Port of fix for BUG#42893 "main.information_schema times out sporadically"
...
(from revision konstantin@mysql.com-20080627154042-923m6lzk7z77lrgj ). This moves the slow part
(10 seconds over 13) into a separate big test.
2009-10-05 16:22:48 +02:00
Alexander Nozdrin
80f6940f07
Merge from mysql-next-mr.
2009-10-04 00:04:53 +04:00
Alexander Nozdrin
5b13393908
Fix default.conf.
2009-10-03 23:59:28 +04:00
Alexander Nozdrin
8bc5d18bd8
Fix default.conf.
2009-10-03 23:47:25 +04:00
Alexander Nozdrin
d045cded3e
Merge from mysql-trunk-bugfixing.
2009-10-02 16:50:18 +04:00
Alexander Nozdrin
2a7edfbe9c
Made two test cases experimental.
2009-10-02 16:48:51 +04:00
Alexander Nozdrin
b966a29740
Merge from mysq-next-mr-wtf.
2009-10-02 16:14:59 +04:00
Alexander Nozdrin
d23d61ef60
Merge from mysql-next-mr.
2009-10-02 16:02:56 +04:00
Alexander Nozdrin
c7dd21688d
Merge from mysql-trunk-bugfixing.
2009-10-01 15:32:45 +04:00
Alexander Nozdrin
35d2352cfb
1. Respect experimental tag in gcov mode;
...
2. Mark ndb, rpl_ndb test suites experimental.
2009-10-01 15:31:54 +04:00
Alexander Nozdrin
a485a837fa
Merge from mysql-next-mr.
2009-10-01 15:22:37 +04:00
Alexander Nozdrin
b9ca003a86
Update default.conf
2009-10-01 15:18:24 +04:00
Alexander Barkov
78c65d561c
After-fix for back-port of WL#3759.
2009-10-01 12:22:31 +05:00
Joerg Bruehe
3fddd10268
Merge "trunk-build" up into "next-mr".
2009-09-30 22:31:22 +02:00
Vladislav Vaintroub
4acaca0202
backport of
...
Revision:
2597.72.1 revid:sp1r-Reggie@core.-20080403153947-15243
removed instances of __NT__ from code. We now only build "NT" binaries
2009-09-30 22:10:22 +02:00
Vladislav Vaintroub
14c2cfb568
Backport of this changeset
...
http://lists.mysql.com/commits/59686
Cleanup pthread_self(), pthread_create(), pthread_join() implementation on Windows.
Prior implementation is was unnecessarily complicated and even differs in embedded
and non-embedded case.
Improvements in this patch:
* pthread_t is now the unique thread ID, instead of HANDLE returned by beginthread
This simplifies pthread_self() to be just straight GetCurrentThreadId().
prior it was much art involved in passing the beginthread() handle from the caller
to the TLS structure in the child thread ( did not work for the main thread of
course)
* remove MySQL specific my_thread_init()/my_thread_end() from pthread_create.
No automagic is done on Unix on pthread_create(). Having the same on Windows will
improve portability and avoid extra #ifdef's
* remove redefinition of getpid() - it was defined as GetCurrentThreadId()
2009-09-30 17:40:12 +02:00
