Commit graph

5760 commits

Author SHA1 Message Date
monty@mashka.mysql.fi
2fc2d558b0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-24 19:14:41 +02:00
serg@serg.mylan
da9ad42881 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-23 22:49:26 +01:00
serg@serg.mylan
01bf966899 missing break added 2004-02-23 22:48:10 +01:00
guilhem@mysql.com
b2e17ff2f3 found typo 2004-02-22 13:04:42 +01:00
monty@mashka.mysql.fi
1ae05760ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-22 11:01:28 +02:00
monty@mashka.mysql.fi
3b83cce5eb merge with 4.0 2004-02-22 09:50:59 +02:00
monty@mashka.mysql.fi
e74182fe52 Cleanups 2004-02-22 08:54:06 +02:00
monty@mashka.mysql.fi
e1bc99c131 After merge fixes
Fixed wrong test of database name (affected optimization of ORDER BY)
2004-02-22 08:09:32 +02:00
monty@mashka.mysql.fi
349358a95b Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2004-02-22 00:40:50 +02:00
monty@mashka.mysql.fi
fdc4a35c94 change that master_server_id is not a restricted word 2004-02-22 00:38:05 +02:00
Sinisa@sinisa.nasamreza.org
9c636d3beb Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-02-21 20:11:47 +02:00
Sinisa@sinisa.nasamreza.org
a1c35fa72c making one symbol a keyword 2004-02-21 20:10:59 +02:00
guilhem@mysql.com
8bfb87ced5 Fix for BUG#2757
"--read-only gives weird error on update".
It is not fixable in 4.0 because it requires modifying
the sql/share/*/errmsg.txt files. So it is fixed in 4.1 like this:
the ER_SKIP_GRANT_TABLES is replaced by a more generic
ER_OPTION_PREVENTS_STATEMENT which can be used both for
"can't do this because of --skip-grant-tables" and
"can't do this because of --read-only" (for this we don't use
ER_CANT_UPDATE_WITH_READLOCK anymore).
So now the message for --read-only is:
"The MySQL server is running with the --read-only option so
cannot execute this statement".
2004-02-21 15:15:26 +01:00
serg@serg.mylan
429a165995 c++ comment fixed 2004-02-21 14:25:43 +01:00
heikki@hundin.mysql.fi
e17e1901f2 ha_innodb.cc, data0type.c, data0type.ic, data0type.h:
Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
2004-02-21 10:21:29 +02:00
serg@serg.mylan
fc16e4ded3 fix for --open-files-limit and broken query_cache_merge.test 2004-02-20 23:42:06 +01:00
serg@serg.mylan
49429da988 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-20 23:18:32 +01:00
serg@serg.mylan
7ff24eb01f longer myisam keys 2004-02-20 20:38:34 +01:00
paul@teton.kitebird.com
fbcb8b950b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-02-20 12:18:13 -06:00
monty@mashka.mysql.fi
494e43c1f5 merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
bell@sanja.is.com.ua
c6c1efba7e after review changes 2004-02-20 16:24:03 +02:00
bell@sanja.is.com.ua
8a442c4e0d after review fix 2004-02-20 15:37:45 +02:00
bell@sanja.is.com.ua
47fb235e49 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
2004-02-20 13:02:05 +02:00
heikki@hundin.mysql.fi
af0d9a709c rem0cmp.c, data0type.c, data0type.ic, data0type.h, ha_innodb.cc:
Remove the now redundant flag DATA_NONLATIN1; better comments
2004-02-20 11:21:12 +02:00
bell@sanja.is.com.ua
f650b5e470 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
2004-02-20 07:41:06 +02:00
monty@mysql.com
f8b4732a5e Safety fixes (strnmov -> strmake) 2004-02-20 00:26:05 +02:00
monty@mysql.com
14dc56b2a1 Fixed usage of strxnmov() in recent changesets 2004-02-19 22:04:31 +02:00
bell@sanja.is.com.ua
d49166f891 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
2004-02-19 20:10:49 +02:00
monty@mashka.mysql.fi
1877521f3a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-19 20:07:03 +02:00
heikki@hundin.mysql.fi
4bed5784dd Many files:
Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
2004-02-19 20:07:02 +02:00
Sinisa@sinisa.nasamreza.org
cd0562158a Fix for a bug #2799.
Multi-table delete's with tables having foreign key constraints
did not return the error.

Also added tests for multi-table updates.
2004-02-19 19:43:46 +02:00
monty@mashka.mysql.fi
cdaf7fcbc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-19 19:38:47 +02:00
monty@mysql.com
4443fa0ee4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-02-19 19:37:31 +02:00
monty@mysql.com
d1e4ede7bf crease number of open files to 2048 on windows
Don't do fsync on temporary .frm files
2004-02-19 19:36:53 +02:00
monty@mashka.mysql.fi
e347f63192 Max open files handling moved to my_set_max_open_files()
This ensures that my_file_info takes this the max number of files into account and one can now use --open-files-limit on windows to increase number of used files up to 2048
2004-02-19 19:33:09 +02:00
serg@serg.mylan
21a0716e84 qnx qcc compatibility fix 2004-02-19 13:41:32 +01:00
serg@serg.mylan
78f0ffefa8 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-19 09:13:48 +01:00
serg@serg.mylan
7a03cf04af potential problem fixed afer some reasoning 2004-02-19 09:11:46 +01:00
bell@sanja.is.com.ua
2d5338ceb0 revision of fix_fields calls in subqueries transformation
after merge fix
2004-02-18 22:14:41 +02:00
paul@teton.kitebird.com
9f1f82c42c Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-02-17 13:15:38 -06:00
serg@serg.mylan
6af8a93052 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-17 17:07:14 +01:00
serg@serg.mylan
b8e161be4b if a key length exceeds the supported maximum and it is safe to auto-decrease it, do it. 2004-02-17 16:57:39 +01:00
bell@sanja.is.com.ua
a66b398eb8 merge 2004-02-17 11:12:55 +02:00
bell@sanja.is.com.ua
f4d1ee971b merge 2004-02-17 01:52:33 +02:00
monty@mysql.com
e9315f984d Changed wellformedlen to well_formed_len
Fixed that blobs >16M can be inserted/updated
Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
2004-02-17 01:35:17 +02:00
bell@sanja.is.com.ua
3f86f10a57 ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure 2004-02-17 01:14:51 +02:00
paul@teton.kitebird.com
f33c6699fd Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-02-16 12:05:25 -06:00
serg@serg.mylan
de240a1ce2 ft_boolean_syntax made changeable 2004-02-16 18:53:00 +01:00
monty@mysql.com
c042a1a654 Added comment 2004-02-16 18:58:21 +02:00
ram@gw.mysql.r18.ru
b55cf65bbd fix for the bug #2786 incorrect precedence for XOR operator 2004-02-16 19:43:43 +04:00