gluh@eagle.intranet.mysql.r18.ru
ddf91f0689
Fix for bug#10059: SHOW TABLE STATUS FROM information_schema
; reports uppercase table names
...
information schema table names are always upper case table names
2005-05-31 13:15:23 +05:00
konstantin@mysql.com
19b8379af6
One more post-review fix.
2005-05-30 21:49:59 +04:00
konstantin@mysql.com
ca6645d852
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-new
2005-05-30 21:47:20 +04:00
konstantin@mysql.com
e315f903d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-new
2005-05-30 20:56:11 +04:00
konstantin@mysql.com
2d6a70c42a
Preparatory (and the most problematic) patch for Bug#7306
...
"the server side preparedStatement error for LIMIT placeholder",
which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
and later steps.
After-review fixes.
2005-05-30 20:54:37 +04:00
dlenev@mysql.com
90d97c1d0b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
2005-05-30 18:59:24 +04:00
dlenev@brandersnatch.localdomain
abfc5b3903
Added test for bug #5894 "Triggers with altered tables cause corrupt
...
databases" and basic handling of errors which happen in triggers.
(The bug itself was fixed by several previous patches).
Fixed bug in multi-delete which were exposed by these tests.
2005-05-30 18:55:56 +04:00
evgen@moonbone.local
329d974df7
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-9593
2005-05-30 03:34:20 +04:00
evgen@moonbone.local
077086cd96
Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the
...
server"
Bug appears only on Windows platform. Freeing memory in
TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in
setup_copy_fields() results in memory destruction. In test IF used instead
of CONCAT because IF have more stable crash.
2005-05-30 03:32:50 +04:00
serg@serg.mylan
6ef172efb8
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-28 10:44:49 +02:00
patg@radha.local
019288c623
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-5.0
2005-05-28 09:00:29 +02:00
serg@serg.mylan
29d6af8d9a
merged
2005-05-28 01:28:18 +02:00
patg@radha.local
d3d727e328
Comment and test changes per review request by Timour. All tests pass on production with this code.
2005-05-27 22:07:46 +02:00
lenz@mysql.com
8e09a3b8d1
- fixed the "test-force" target in the toplevel Makefile.am for systems on which
...
"." is not in the PATH...
2005-05-27 19:20:29 +02:00
msvensson@neptunus.(none)
cf3e568495
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 18:30:35 +02:00
msvensson@neptunus.(none)
a07d8b1951
Merge neptunus.(none):/home/msvensson/mysql/bug9993
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 17:22:19 +02:00
heikki@hundin.mysql.fi
4ea3ec87f3
ha_innodb.cc:
...
Check in Jan's fix to bug #10746 and also add a note to ::start_stmt() that stored procs in 5.0 call it
2005-05-27 17:04:50 +03:00
gluh@eagle.intranet.mysql.r18.ru
26e9e13c26
Fix for bug #9992 : mysql_next_result hangs on error
...
set net->no_send_error to 0 before execution of each element of
multiquery statement to provide the sending of error to client
2005-05-27 18:01:09 +05:00
serg@serg.mylan
f9e9406b40
forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures
2005-05-27 14:15:08 +02:00
serg@serg.mylan
324c20d41c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-27 12:48:36 +02:00
dlenev@mysql.com
eaa7f6ab88
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
2005-05-27 14:38:34 +04:00
serg@serg.mylan
d21b8d1077
don't downgrade the lock for CREATE ... SELECT (bug#6678)
2005-05-27 12:38:29 +02:00
dlenev@brandersnatch.localdomain
0ef3267251
Fix for trigger.test failure in --debug mode.
...
We can't have Item_trigger_field as aggregated object inside of
sp_instr_set_trigger_field class since in this case its destructor
will be called twice. So instead let us create this Item separately
and store pointer to it in instruction object.
2005-05-27 14:15:17 +04:00
msvensson@neptunus.(none)
3490108235
Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1
2005-05-27 12:03:37 +02:00
msvensson@neptunus.(none)
aa99b05be7
Fix rpl_log and rpl_rotate_logs test result
...
- Remove the expected warrnings when "show binary logs" are called on zero size binary log files.
2005-05-27 12:01:41 +02:00
msvensson@neptunus.(none)
ed6b9812f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 10:10:16 +02:00
monty@mysql.com
f8cb00640f
Fix broken test case (after merge)
2005-05-26 23:33:20 +03:00
msvensson@neptunus.(none)
697cfe7f07
Merge from 4.1
2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
90f971ae2c
Include fix to function open_binlog from 4.1
...
- Add O_SHARE when opening file.
2005-05-26 21:01:54 +02:00
sergefp@mysql.com
59db44382b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
2005-05-26 21:01:53 +02:00
sergefp@mysql.com
41c8f46160
Post-review fixes: rename SHOW_DOUBLE to SHOW_DOUBLE_STATUS
2005-05-26 20:54:02 +02:00
msvensson@neptunus.(none)
dbcf3b3a2e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 20:02:21 +02:00
bell@sanja.is.com.ua
68899decc2
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-05-26 19:32:58 +03:00
joerg@mysql.com
55fe5aaa47
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-05-26 18:20:17 +02:00
joerg@mysql.com
5178c84bef
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-05-26 18:12:56 +02:00
bell@sanja.is.com.ua
b186d8b4f9
merge
2005-05-26 18:33:57 +03:00
joerg@mysql.com
76b25fc194
Corrected merge error in 'mysql-test/r/select.result': two test blocks inserted in wrong order.
2005-05-26 16:47:44 +02:00
msvensson@neptunus.(none)
8401cd5d79
BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables
...
- Dont perform automatic privilege handling for stored procedures when server is started --skip-grant-tables
- Renamed view_skip_grants to skip_grants and added test cases for this
2005-05-26 16:44:46 +02:00
bell@sanja.is.com.ua
db2ce1edf6
fixed problem with long string results of expressions in UNIONS (BUG#10025)
2005-05-26 17:30:12 +03:00
marko@hundin.mysql.fi
5d0bc0b482
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-05-26 15:57:24 +03:00
marko@hundin.mysql.fi
2d5b96798f
InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335 ).
2005-05-26 15:42:24 +03:00
monty@mysql.com
3f17e9a4e3
Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0
2005-05-26 15:20:27 +03:00
monty@mysql.com
206c0ebbc3
Moved detection of wrong decimal fields before decimal field was created to avoid ASSERT() for DECIMAL(1)
2005-05-26 14:00:47 +03:00
joerg@mysql.com
4572248a84
Correction of merge mishandling in 'client/client_priv.h'.
2005-05-26 12:58:55 +02:00
joerg@mysql.com
f39f049041
Merge
2005-05-26 12:55:31 +02:00
joerg@mysql.com
9504bd0ddd
Manual merge.
2005-05-26 12:51:44 +02:00
msvensson@neptunus.(none)
6c00006d2c
Fix icc compiler warning
2005-05-26 12:12:36 +02:00
msvensson@neptunus.(none)
975ca22872
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
83d430353e
Add ifdefs to control when "#pragma implementation" should be used
...
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +02:00
msvensson@neptunus.(none)
676ba73480
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-26 11:37:19 +02:00