61fd95d168
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-07 15:23:05 +03:00
5fa9953ce3
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1
2004-04-07 17:23:04 +05:00
ca75b62d5a
Correct handling of parameter variables with NULL values in PREPARE queries
2004-04-07 12:58:28 +04:00
70c4eb5838
Portability fixes
...
Fixed problems with group_concat() and HAVING
Updated crash-me values
2004-04-07 04:33:58 +03:00
e8eda8129f
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
...
Field::val_str simplification, comment
2004-04-06 21:35:26 +02:00
472e87a40c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-06 18:30:34 +03:00
aeff7ce714
fixed
...
bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database)
2004-04-06 20:26:35 +05:00
950a2ebab1
Fixed charsetnr sent to the client
2004-04-06 19:57:33 +05:00
7ca9a70583
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-06 17:17:15 +03:00
0cc998a466
fixed the tests mysql-test/t/synchronization.test
...
for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
2004-04-06 19:17:13 +05:00
49330f61da
Fixed warnings from valgrind (not a bug)
...
Don't add -debug to server version if MYSQL_SERVER_PREFIX is used
Indentation cleanups
2004-04-06 12:13:43 +03:00
7b68b26623
fixed Bug #3361 "mysqldump quotes DECIMAL values"
2004-04-05 23:18:16 +05:00
1f8505d66f
Post-merge fixes
2004-04-05 19:52:10 +04:00
a8386d01c2
Many files:
...
SQL Syntax for Prepared Statements (WL#1622)
ps.test, ps.result:
new file
2004-04-05 19:43:37 +04:00
03caa47acb
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.curr
2004-04-05 19:14:31 +05:00
0013516951
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-05 16:28:16 +03:00
611409490a
corrected wrong checking of DBUG_OFF in mysql-test/t/synchronization.test
2004-04-05 18:27:19 +05:00
8a4e6c6482
WL1368: SHOW GRANTS FOR CURRENT USER
...
'SHOW GRANTS' syntax is added
'SHOW GRANTS FOR CURRENT_USER' syntax is added
'SHOW GRANTS FOR CURRENT_USER()' syntax is added
CURRENT_USER without parens in expressions(SELECT CURRENT_USER;)
2004-04-05 17:55:26 +05:00
42cf92ce37
Fixed many compiler warnings
...
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695 , #3381 and #3319 )
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
2004-04-05 13:56:05 +03:00
1e4af935c1
removed old way to prevent using stack tables for caching Items in PS
...
fixed error code in union test
2004-04-04 03:05:44 +03:00
c31f3cf1d2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-on-4.1
2004-04-03 11:28:20 +03:00
2f4d2a0e38
fixed brocken of client_test
...
fixed aggregate functions in PS (BUG#3360)
2004-04-03 11:13:51 +03:00
18b4e9c970
added skipped ``mysql-test/r/synchronization.result''
2004-04-03 02:50:40 +05:00
00d429ac51
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
2004-04-03 02:47:02 +05:00
5f2d73ed96
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
2004-04-03 02:46:12 +05:00
8cc3b3cfdc
made some optimization of last patch for
...
Bug #2385 "CREATE TABLE LIKE lacks locking on source and destination table"
(in sql_table.cc and mysql-test/t/synchronization.test)
2004-04-03 02:44:38 +05:00
1198b23a73
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2397/mysql-4.1
2004-04-03 01:39:45 +05:00
64e9d61fd2
added newline to the end of mysql-test/t/system_mysql_db_fix-master.opt
...
for working on aix and so on..
2004-04-02 21:58:34 +05:00
f6bff2e6c6
WL#1266 "Separate auto-set logic from TIMESTAMP type."
...
Final version of patch.
Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
2004-04-02 10:12:53 +04:00
a80f46bfdf
WL#775 "Add status variable identifying binlog_cache_size shortage"
...
Added two status variables:
binlog_cache_use - counts number of transactions that used somehow
transaction temporary binary log.
binlog_cache_disk_use - counts number of transactions that required
disk I/O for storing info in this this binary log.
2004-04-02 00:47:20 +04:00
15cd52c6cb
added synchronization in mysql_create_like_table
...
(
fixed BUG #2385 CREATE TABLE LIKE lacks locking on source and destination table
and added tests for it
)
2004-04-01 23:13:25 +05:00
7a580ce991
fixed
...
BUG #2397 "RENAME TABLES is not blocked by FLUSH TABLES WITH READ LOCK"
(added waiting for global_read_lock in mysql_rename_tables)
2004-04-01 22:47:09 +05:00
da3308ef57
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1
2004-03-31 14:30:53 +05:00
daba6b63b8
Fix for bug #2160 : Extra error message for CREATE TABLE LIKE with InnoDB
2004-03-31 14:29:01 +05:00
99f712a30b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2004-03-31 08:24:12 +03:00
ddafa2cc16
simple optimzation
...
Portability fixes
2004-03-31 03:32:38 +03:00
e3a619f005
null processing for character_set_results (BUG#3296)
2004-03-30 23:38:56 +03:00
fede76ddf2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-30 22:20:40 +03:00
eedb8ce92e
http://bugs.mysql.com/bug.php?id=3255
...
Collation gets lost in CREATE TABLE (...) DEFAULT CHARACTER SET xxx COLLATE yyy
This is fixed now.
Test is added into the test suite.
2004-03-30 22:38:52 +05:00
b92dd45da4
ALTER TABLE t1 CONVERT TO should also change the default character set.
...
Forgot to do it in the previous commit.
2004-03-30 22:18:49 +05:00
dba73e1c86
More different syntaxes for (1) modifying the default charaset/collation
...
and for (2) converting the columns:
1. ALTER TABLE t1 [DEFAULT] CHARACTER SET xxx [COLLATE yyy]
2. ALTER TABLE t1 CONVERT TO CHARACTER SET xxx [COLLATE yyy]
2004-03-30 21:33:45 +05:00
f602829c75
Fix to get correct metadata when using temporary tables to create result. (Bug #2654 )
2004-03-30 19:24:28 +03:00
3bfbe6e0dd
resolving conflicts
2004-03-30 16:04:08 +05:00
4bc6b551f8
false/true -> FALSE/TRUE
...
Fixes after last merge
2004-03-30 02:32:41 +03:00
38ab8ddb22
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
2004-03-30 01:02:21 +03:00
8ab16104e8
Fix test results when you are in daylight saving time
2004-03-30 01:01:31 +03:00
dc2f606fb8
Merge with 4.0 to get lastest bug fixes
2004-03-29 19:21:53 +03:00
7e161ae070
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-03-29 17:27:25 +03:00
928e796e67
Better error messages for not nullable
...
SET character_set_xxx=NULL
and
SET collation_xxx=NULL
2004-03-29 18:33:24 +05:00
11f14e0050
Better tests for BINARY
2004-03-29 17:27:30 +05:00
