Commit graph

12810 commits

Author SHA1 Message Date
unknown
3165c7deda Language/consistency edits to error messages
and affected test results.
2004-06-15 22:18:20 -05:00
unknown
1926d4ee34 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 15:41:22 -05:00
unknown
b1cecee055 Language/consistency edits to error messages
and affected test results.
2004-06-15 15:38:36 -05:00
unknown
29c22ddac8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 10:35:06 -05:00
unknown
90876da0e4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 07:52:42 -05:00
unknown
a35bd15773 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-15 14:49:25 +02:00
unknown
c488fe233c Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-15 14:41:23 +02:00
unknown
ee7bc435e3 - make sure to define NDEBUG in my_dbug.h, when DBUG_OFF is defined
(to disable assertions)


include/my_dbug.h:
   - make sure to define NDEBUG, when DBUG_OFF is defined (to disable
     assertions)
2004-06-15 14:37:45 +02:00
unknown
0f83847940 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4035


sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
2004-06-15 16:03:16 +05:00
unknown
40b08dce0b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-15 13:02:07 +02:00
unknown
2ef5b0ed4e We don't need tmp_value member in the Item_func_left.
sql/item_strfunc.cc:
  We don't need tmp_value member here.
sql/item_strfunc.h:
  We don't need tmp_value member here.
2004-06-15 16:01:43 +05:00
unknown
fa4b3f0fcc - compile fix for regex/regcomp.c spotted on Mac OS X
(too few arguments)


regex/regcomp.c:
   - compile fix spotted on Mac OS X (too few arguments)
2004-06-15 12:58:58 +02:00
unknown
125f840133 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/4.1
2004-06-15 10:29:23 +02:00
unknown
964618ede2 Fixed to compile with IBM C Compiler for AIX Version 6 2004-06-15 12:29:22 +04:00
unknown
9e5a10e24b adden ndb faster start to mysql-test-run 2004-06-15 09:01:36 +02:00
unknown
42d9baf933 ndb fixes for make dist
mysql-test/ndb/ndbcluster.sh:
  Change mode to -rw-rw-r--
2004-06-15 08:14:20 +02:00
unknown
6a921d5f6e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-14 23:44:21 -05:00
unknown
61540a24d7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-15 06:33:03 +02:00
unknown
0c4187e0c2 ctype-uca.c:
Compilation failure fix.


strings/ctype-uca.c:
  Compilation failure fix.
2004-06-15 09:33:02 +05:00
unknown
c4dbb09193 - re-enabled NDB cluster in compile-pentium-max
BUILD/compile-pentium-max:
   - re-enabled NDB cluster
2004-06-14 21:17:28 +02:00
unknown
a616c3dfbc utf8 contraction fix.
Polish collation fix.
Slovak collation fix.
Testing all language orders.
2004-06-14 21:55:36 +05:00
unknown
22932b55d6 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-14 11:21:06 -05:00
unknown
93d97129bc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/wl1823


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-06-14 16:20:23 +02:00
unknown
9b55fbf337 testBlobs.cpp, NdbBlob.cpp:
small blob fix


ndb/src/ndbapi/NdbBlob.cpp:
  small blob fix
ndb/test/ndbapi/testBlobs.cpp:
  small blob fix
2004-06-14 15:21:00 +02:00
unknown
0495242ff9 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/wl1823
2004-06-14 14:23:48 +02:00
unknown
10ce930c53 UTF8 UCA based collations. 2004-06-14 16:29:51 +05:00
unknown
2526a4781b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-blobs
2004-06-14 12:53:14 +02:00
unknown
4e3b3bc835 wl1858
1) update atrt to support mysqld
2) add example
3) add our current basic tests
2004-06-14 12:21:13 +02:00
unknown
25e262a068 Remove docs from make for now.
Plan is to introduce --flag, but Tomas will do that later.
2004-06-14 09:53:59 +02:00
unknown
b0ecaefe1a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-13 22:23:32 -05:00
unknown
400648ebd0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/bk/mysql-4.1
2004-06-12 14:38:45 -05:00
unknown
e1917c88f6 sql_state.h:
Fix couple of typos.


include/sql_state.h:
  Fix couple of typos.
2004-06-12 14:37:41 -05:00
unknown
f573ee0887 Unicode collation algorithm: contraction support.
E.g. 'Ch' is treated as a separate letter in Czech,
not as a combination of C+h.
2004-06-12 20:36:58 +05:00
unknown
a86e6f1788 mysql-copyright:
Fixed various issues to deal with untarring of gpl tar file, clearing configure.in, changed calls to use system vs. backticks


Build-tools/mysql-copyright:
  Fixed various issues to deal with untarring of gpl tar file, clearing configure.in, changed calls to use system vs. backticks
2004-06-11 17:20:30 -07:00
unknown
cf7949b2b1 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-11 19:07:36 -05:00
unknown
fe94000324 after merge fix 2004-06-11 22:00:08 +02:00
unknown
d5880298be after merge fix
myisam/mi_unique.c:
  warning removed
2004-06-11 21:20:53 +02:00
unknown
e9242d685b merged
acinclude.m4:
  Auto merged
include/m_ctype.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-czech.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-uca.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
2004-06-11 20:55:08 +02:00
unknown
b67706b131 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.4014
2004-06-11 23:00:49 +05:00
unknown
aed108a2b7 mysqltest.c: don't hardcode variables to be taken from environment.
use MYSQL_TCP_PORT instead of 3306 in tests


client/mysqltest.c:
  don't hardcode variables to be taken from environment.
mysql-test/mysql-test-run.sh:
  MYSQL_TCP_PORT instead of 3306
mysql-test/t/rpl000015.test:
  MYSQL_TCP_PORT instead of 3306
2004-06-11 18:26:13 +02:00
unknown
48feb97356 Made discless a config parameter instead of a env. variable 2004-06-11 17:29:39 +02:00
unknown
a3a178d67b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-11 10:24:46 -05:00
unknown
e914e6c7c3 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-11 16:44:26 +02:00
unknown
9155e8de41 Move UCA language specific definitions into ctype-ucs.c. 2004-06-11 19:16:06 +05:00
unknown
89ba9400c2 BUG#4088 2004-06-11 15:54:46 +02:00
unknown
da7b7d550e charset.c:
Reuse some code between simple and UCA collations.


mysys/charset.c:
  Reuse some code between simple and UCA collations.
2004-06-11 18:25:50 +05:00
unknown
859b1a8c48 Initialize max_sort_char only if a character set is requested. 2004-06-11 17:50:20 +05:00
unknown
3469cc22e7 Forgot to change 31 into mask_value 2004-06-11 13:56:00 +02:00
unknown
5275eb21c2 Allocate memory when a character set is requested:
- For simple character sets: from_uni convertion table.
- For UCA: alternative weight arrays.
Use mbminlen instead of MY_CS_NONTEXT
2004-06-11 16:29:16 +05:00
unknown
4047b5ade3 Fix for Bug#4079 "error checking in prepared statements":
reset mysql->status if there was an error in row reading.


libmysql/libmysql.c:
  Fix for bug#4079
tests/client_test.c:
  Test for bug #4079
2004-06-11 13:12:29 +04:00