Commit graph

14611 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
b57e68e6e0 fixed typo in group_concat printing (BUG#5161) 2004-09-01 21:32:24 +03:00
miguel@hegel.txg.br
ca42de54a1 Fix for bug #5302 2004-09-01 14:02:11 -03:00
tomas@poseidon.(none)
12c4007867 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-01 14:58:12 +00:00
tomas@poseidon.(none)
bc8594364a added class Ndb_cluster_connection to prepare for making order of starting mysqld and ndbd irrelevant 2004-09-01 14:56:53 +00:00
lenz@mysql.com
7b8b5d8969 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-09-01 16:17:49 +02:00
lenz@mysql.com
1483564b49 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-09-01 16:04:51 +02:00
lenz@mysql.com
80879cffe6 - removed swedish errmsg.OLD 2004-09-01 16:04:01 +02:00
heikki@hundin.mysql.fi
40c0fde904 ha_innodb.cc:
If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
2004-09-01 16:41:09 +03:00
joreland@mysql.com
7e22cf6fa8 Piggy back close scan req 2004-09-01 13:42:58 +02:00
marko@hundin.mysql.fi
09f3166267 row0mysql.c:
row_drop_table_for_mysql(): Removed duplicated block of code.
2004-09-01 14:04:17 +03:00
joerg@mysql.com
1a44a2110c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2004-09-01 12:46:56 +02:00
bar@mysql.com
153e18a252 Allow IN to convert arguments into Unicode in some cases. 2004-09-01 15:39:15 +05:00
joerg@mysql.com
9e2e71816f Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES"
(backport from 4.1).
2004-09-01 12:36:01 +02:00
bar@mysql.com
4f32cd2b3d Move collation aggregation with superset conversion code
from Item_bool_func2 into DTCollation to make it reusable
for other types of items.
2004-09-01 13:56:33 +05:00
konstantin@mysql.com
3ee572768b Make client_test pass on 64-bit HP-UX11: long is 64 bit,
replace all (mis)uses of it with int32.
2004-09-01 12:50:23 +04:00
joreland@mysql.com
16a714c932 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025
2004-09-01 04:56:45 +02:00
joreland@mysql.com
e148567003 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-01 04:55:16 +02:00
joreland@mysql.com
51b79a8448 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025
2004-09-01 04:52:50 +02:00
joreland@mysql.com
58c30f2b3f Fix bug in trans counter for read 2004-09-01 04:50:17 +02:00
patg@krsna.patg.net
54eac3b8d4 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0
into krsna.patg.net:/home/patg/mysql-4.0
2004-08-31 19:04:07 -07:00
patg@krsna.patg.net
e277145911 mysqld_safe.sh:
bug #5001, added conditional if to test if port set, then only kill the processes
  for this port, not all processes (in the case of this bug where multiple servers 
  are killed.)
  The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's
  discovery that mysqld_safe would get killed. 
  In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file"
  was the case that evaluated as true, so in order to test, I had to comment that block
  out.
2004-08-31 18:59:41 -07:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
monty@mysql.com
ba4d4ce97a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-09-01 02:13:35 +03:00
joreland@mysql.com
30171dd181 Also update printer 2004-08-31 22:17:58 +02:00
joreland@mysql.com
c246824929 Added some more options to TC timers, such as:
1) explicit start/stop timer (instead of perodical reports)
2) scan & range scan reporting
2004-08-31 22:12:08 +02:00
joreland@mysql.com
36482c379e bug#4591 2004-08-31 21:34:11 +02:00
mwagner@here.mwagner.org
3f0f1a4fb2 Do-compile:
Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
2004-08-31 13:29:28 -05:00
bell@sanja.is.com.ua
b02451c5bd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-not-4.1
2004-08-31 21:11:54 +03:00
bell@sanja.is.com.ua
2cf1234ba2 after review patch 2004-08-31 21:10:57 +03:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05:00
joreland@mysql.com
6919c1d781 run in loop 2004-08-31 16:27:31 +02:00
mskold@mysql.com
ae801bad8d Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 15:53:28 +02:00
bar@mysql.com
34688d710c Better easier to call error message format. 2004-08-31 18:53:27 +05:00
lenz@mysql.com
87cbc358e9 - bumped up version number in configure.in to "4.1.5-gamma"
- tagged ChangeSet@1.2013 as "mysql-4.1.4"
2004-08-31 15:53:26 +02:00
monty@mysql.com
7abae83300 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-08-31 16:53:25 +03:00
vva@eagle.mysql.r18.ru
e022b3144e Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-08-31 18:53:24 +05:00
vva@eagle.mysql.r18.ru
53b804a679 fixed two compiling bugs for libedit 2004-08-31 18:29:01 +05:00
joreland@mysql.com
76629f5299 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025
2004-08-31 15:07:43 +02:00
joreland@mysql.com
2856ddb69d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-31 15:00:50 +02:00
joreland@mysql.com
dc42d38bcc Update test prg
1) merge join
2) lookups
2004-08-31 14:53:59 +02:00
vva@eagle.mysql.r18.ru
940753e342 fixed compiling bug of libedit on qnx
discarded using of uint in cmd-line-utils/libedit/chared.c
because it's undefined on qnx
2004-08-31 17:51:02 +05:00
vva@eagle.mysql.r18.ru
5787776355 fixed compiling bug
(non gcc compilers don't understand '-Dx()=' option)
2004-08-31 17:29:47 +05:00
monty@mysql.com
6adaff23a4 Review of new pushed code (Indentation fixes and simple optimizations)
Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files
2004-08-31 14:35:04 +03:00
sergefp@mysql.com
e4ffae2a0e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames
2004-08-31 14:12:42 +04:00
mskold@mysql.com
84196617c1 Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
sergefp@mysql.com
5d3dc82daa Change Item_arena::state to enum 2004-08-31 14:07:02 +04:00
mskold@mysql.com
b0bac7d1e0 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 10:20:51 +02:00
mskold@mysql.com
4f8a82dbfe Enabled HA_NULL_IN_KEY support 2004-08-31 10:19:10 +02:00
joreland@mysql.com
36138be04e Interpreter fix + tets prg 2004-08-31 10:14:36 +02:00
mskold@mysql.com
4b1671c933 Simplified expensive test 2004-08-31 10:00:33 +02:00