bell@sanja.is.com.ua
157af12f36
fixed parameter to avoid accessing unallocated memory
2004-12-13 14:54:13 +02:00
tomas@poseidon.ndb.mysql.com
e45f8857a3
fixed event thread for better error handling
2004-12-13 13:43:28 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
9818cadd1b
WL#2274 - INSERT..SELECT..UPDATE
...
UPDATE clause conflicts with SELECT for use of item_list field.
Alter UPDATE clause to use new lex field update_list
Tests included
2004-12-13 12:26:28 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
081a714b48
Some fixes for Netware.
2004-12-13 14:19:34 +02:00
joreland@mysql.com
fd8b0f261e
ndb - Handle shm-transporter wo/ busy-wait + also
...
handled mixed tcp/shm transporters
+ bug#7124
2004-12-13 12:50:33 +01:00
matthias@three.local.lan
ac11cba790
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-13 12:24:35 +01:00
tomas@poseidon.ndb.mysql.com
4b6a752180
bug #7230
...
+ fixed testcase
2004-12-13 11:45:45 +01:00
marko@hundin.mysql.fi
cd8743409f
dict0load.c:
...
dict_load_table(): detect the new table format of MySQL 5.0.3
2004-12-13 12:31:17 +02:00
bell@sanja.is.com.ua
9819df20c9
initialize variables (addition for BUG#7079)
2004-12-13 08:45:00 +02:00
tomas@poseidon.ndb.mysql.com
faafe1e4d0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-13 00:52:29 +01:00
tomas@poseidon.ndb.mysql.com
5281d26824
CommandInterpreter.cpp:
...
changed help text
2004-12-13 00:51:30 +01:00
tomas@poseidon.ndb.mysql.com
afa5a6a7bf
fix bug#7193
...
added start backup parameter to enable setting wait state
and set different timeouts depending on waitstate
moved listen of backup event out of backup and into separete thread
thread created at connect() and destroyed at disconnect()
added start backup command options "nowait" "wait completed" "wait started"
fixed log level settings
2004-12-13 00:48:06 +01:00
bell@sanja.is.com.ua
05c1385c50
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1
2004-12-13 01:32:49 +02:00
bell@sanja.is.com.ua
f65403cd75
fixed optimized SOME subquery
2004-12-13 01:21:14 +02:00
sergefp@mysql.com
2d9fae642c
Merge fix for BUG#6976 from 4.0
2004-12-11 20:13:43 +03:00
sergefp@mysql.com
0de1d4a9a9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/dbdata/psergey/mysql-4.0-bug6976
2004-12-11 20:02:45 +03:00
sergefp@mysql.com
f78a60593a
Fix for BUG#6976:
...
In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the
same as in (*ref), because Item_ref::fix_fields() will not be called. Previously
maybe_null was 0 always and this produced a bogus state where
maybe_null==0 && is_null() == true
which broke evaluation for some upper-level Items, like AND and OR.
2004-12-11 19:59:09 +03:00
bell@sanja.is.com.ua
b9abf25a55
new reference which refer to current value not to result used for resolving outer
...
refernces if subqueri is not in HAVING clause (BUG#7079)
and the same used for subquery transformetion
2004-12-11 17:13:19 +02:00
sergefp@mysql.com
5b0e3b132c
Post-merge fixes
2004-12-11 16:36:12 +03:00
sergefp@mysql.com
aee9340493
Fix for BUG#5837 merged from 4.0
2004-12-11 15:55:50 +03:00
sergefp@mysql.com
6b55909673
Fix for BUG#5837 - attempt 3.
...
Call mark_as_null_row in join_read_const and join_read_system.
2004-12-11 15:51:52 +03:00
tomas@poseidon.ndb.mysql.com
0d27a7550f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-11 12:11:25 +01:00
serg@serg.mylan
d7acab1530
sql/password.c: check for buffer overflow in check_scramble_323 (BUG#7187)
2004-12-11 10:17:25 +01:00
serg@serg.mylan
68174d7ace
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-11 09:41:01 +01:00
serg@serg.mylan
d16c9e8615
getting rid of now() is tests
2004-12-11 09:39:29 +01:00
jimw@mysql.com
475d1a8934
Fix results file for insert_select test with embedded server. (Bug #7167 )
2004-12-10 23:50:09 +01:00
marko@hundin.mysql.fi
99571d271e
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-12-10 23:38:44 +02:00
marko@hundin.mysql.fi
e8885a0824
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-12-10 23:33:55 +02:00
serg@serg.mylan
358b8a4914
Merge
2004-12-10 18:58:28 +01:00
serg@serg.mylan
09b2dc89be
manually merged
2004-12-10 18:49:36 +01:00
ram@gw.mysql.r18.ru
89a0623e55
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-10 21:26:28 +04:00
heikki@hundin.mysql.fi
2c1e258586
row0mysql.h:
...
Remove accidentally pushed unnecessary change
2004-12-10 18:09:07 +02:00
ram@gw.mysql.r18.ru
41a509ba86
A fix (bug #7129 : Test failure: 'type_ranges' when using '--ps-protocol'
...
bug #7126 : Test failure: 'func_str' when using '--ps-protocol'
bug #7130 : Test failure: 'type_uint' when using '--ps-protocol').
2004-12-10 20:07:00 +04:00
heikki@hundin.mysql.fi
713a3103c6
dict0dict.c, log.cc:
...
Remove accidentally merged 4.0 changes
dict0dict.c:
Remove the 4.0 fix accidentally auto-merged to 4.1
row0mysql.h, dict0dict.h:
Remove a change auto-merged from 4.0
2004-12-10 18:03:43 +02:00
heikki@hundin.mysql.fi
d9fbdff6a2
Merge
2004-12-10 17:15:23 +02:00
heikki@hundin.mysql.fi
ea6b5e117a
dict0dict.h, dict0dict.c, ha_innodb.cc:
...
Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
2004-12-10 17:12:47 +02:00
heikki@hundin.mysql.fi
536702f4c5
dict0dict.c:
...
In the FOREIGN KEY parser, do not cut 0xC2A0 from the end of an identifier if it was quoted
2004-12-10 17:05:40 +02:00
bar@mysql.com
f1e876252d
Privileges columns were removed from output to be able
...
to reuse test results for both server and --embedded-server
versions.
2004-12-10 17:58:13 +04:00
kent@mysql.com
56c47c6549
mysql-test-run.sh:
...
Use different TESTS_BINDIR for --embedded-server
2004-12-10 14:01:03 +01:00
kent@mysql.com
df6e569e0d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-patches
2004-12-10 13:31:51 +01:00
bar@mysql.com
0cfa0adda5
Bug #6819 Some ujis characters cannot be inserted into table
...
Allow to insert not-assigned UJIS codes.
2004-12-10 16:08:18 +04:00
kent@mysql.com
081fdcc2e1
Makefile.am:
...
Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
when linking. For -all-static linking libtool put -lc after the .la
file and this put the libc regex functions before our regex functions
when linking on Linux.
2004-12-10 13:06:58 +01:00
tomas@poseidon.ndb.mysql.com
8c387cac37
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-10 13:06:50 +01:00
hf@deer.(none)
192715dbbb
Fix for bug #6516 (Server crash loading spatial data)
...
(after discussion with SerG)
2004-12-10 16:06:49 +04:00
heikki@hundin.mysql.fi
4915d196eb
dict0dict.c:
...
Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8
2004-12-10 02:36:45 +02:00
Sinisa@sinisa.nasamreza.org
d7734fd8ac
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-12-10 00:19:52 +02:00
Sinisa@sinisa.nasamreza.org
6772f0a721
A fix for a crashing bug #7101 , which occures when the
...
expression involving LEFT() function is used in GROUP BY
field.
2004-12-10 00:17:43 +02:00
marko@hundin.mysql.fi
15152a380d
srv0srv.c:
...
srv_printf_innodb_monitor(): Removed extraneous rewind() call.
The caller of this function calls rewind() if necessary.
In this way, we avoid rewind()ing stderr in
srv_lock_timeout_and_monitor_thread().
2004-12-10 00:06:33 +02:00
mwagner@mysql.com
5ad7286bd5
Do-compile:
...
Added --with-csv and --with-example for CSV and Example storage engines
2004-12-09 19:47:41 +01:00
pekka@mysql.com
23c5bd4c35
ndb: sunfire100c: fix aligment when 32-bit pointers and 64-bit ha_rows
2004-12-09 15:18:31 +01:00