Commit graph

11073 commits

Author SHA1 Message Date
serg@serg.mylan
abfa3f0a98 missing semicolon 2004-02-17 21:12:24 +01: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
monty@mysql.com
0c68e80609 Fix test results 2004-02-17 14:20:04 +02:00
bell@sanja.is.com.ua
8a865250c4 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-02-17 02:28:17 +02:00
bell@sanja.is.com.ua
f42deb58e6 changed to moderm syntax (after merge fix) 2004-02-17 02:26:35 +02:00
wax@mysql.com
67677dcba8 Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1
2004-02-17 05:15:10 +05:00
wax@kishkin.ru
f38b08af91 correct cleaning of TZ
add a check of the version Visual C
2004-02-17 05:09:42 +05: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
e6de937e0d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-02-17 01:17:41 +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
serg@serg.mylan
90eb2d26ed Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-16 19:05:44 +01:00
serg@serg.mylan
de240a1ce2 ft_boolean_syntax made changeable 2004-02-16 18:53:00 +01:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
monty@mysql.com
d1d48a9dd5 Merge with 4.0 to get fix for mysqlbinlog 2004-02-16 10:15:52 +02:00
monty@mysql.com
f43093ec0e After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
2004-02-16 10:03:25 +02:00
monty@mysql.com
4aafb1ef3d Cleanup + safety comment 2004-02-16 09:41:13 +02:00
monty@mysql.com
3e1ec19901 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-02-16 09:34:04 +02:00
heikki@hundin.mysql.fi
25aff697d1 srv0srv.c:
Add a missing space to the output format of SHOW INNODB STATUS; reported by Jocelyn Fournier
2004-02-16 09:16:41 +02:00
serg@serg.mylan
3c1e8aa4aa Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-15 20:37:11 +01:00
serg@serg.mylan
15249d6a72 bug#2708
test results updated
2004-02-15 20:36:12 +01:00
bell@sanja.is.com.ua
80b0188663 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-02-15 20:24:39 +02:00
serg@serg.mylan
03ffb63f08 no dots in the error messages!
--disable-warning in union.test
2004-02-15 19:16:38 +01:00
bell@sanja.is.com.ua
0e69007da8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-02-15 19:46:52 +02:00
bell@sanja.is.com.ua
f18c9bdbd6 fixed initialization to satisfy valgrind 2004-02-15 19:46:23 +02:00
serg@serg.mylan
abc9ef9770 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-15 18:35:06 +01:00
vva@eagle.mysql.r18.ru
9585dd63df Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2705/mysql-4.1
2004-02-15 21:35:05 +04:00
serg@serg.mylan
e9c46aaf80 REVOKE ALL PRIVILEGES, GRANT FROM user_list
is changed to a more consistent
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_list.
Bug 
2004-02-15 17:59:52 +01:00
Sinisa@sinisa.nasamreza.org
d43f102020 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-02-14 20:24:49 +02:00
hf@deer.(none)
6e0cda9f65 error code changed in union.test 2004-02-14 21:27:09 +04:00
hf@deer.(none)
e1a38d151a Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2212
2004-02-14 21:06:02 +04:00
bell@sanja.is.com.ua
06410f41b4 changed error code 2004-02-14 18:53:24 +02:00
hf@deer.(none)
e100530b3e Fix for (mysql_change_user doesn't work in embedded library)
now it's working
2004-02-14 20:26:21 +04:00
hf@deer.(none)
b0d04923bc Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2211
2004-02-14 18:12:23 +04:00
Sinisa@sinisa.nasamreza.org
eb83bb374a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-02-14 15:08:32 +02:00
Sinisa@sinisa.nasamreza.org
158ba5ab5b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-02-14 15:06:09 +02:00
bell@sanja.is.com.ua
59156e2646 fixed test results broken by sombody 2004-02-14 13:48:54 +02:00
bell@sanja.is.com.ua
7626ab603e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
2004-02-14 13:06:04 +02:00
vva@eagle.mysql.r18.ru
50fb56399a Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2592/mysql-4.1
2004-02-14 02:28:19 +04:00
vva@eagle.mysql.r18.ru
48d4e33328 a little optimization in yylex
(case MY_LEX_USER_VARIABLE_DELIMITER for multichar strings)
and my_mbcharlen
2004-02-14 02:26:27 +04:00
vva@eagle.mysql.r18.ru
bdf696d0a4 fixed bug "mysqldump --tab extra output" 2004-02-14 01:21:46 +04:00
serg@serg.mylan
01c2ca5b8a Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-13 15:30:00 +01:00
serg@serg.mylan
26c7003e37 small optimization 2004-02-13 15:27:58 +01:00
serg@serg.mylan
5914e5705c my_atof is deleted
strtod from mit-threads is restored and cleaned up
2004-02-13 15:27:21 +01:00
monty@mysql.com
fb8f27f017 Always use libtool with "--preserve-dup-deps"
Always use all LOAD DATA options in replication.
Fixed problem in mysqlbinlog where LOAD DATA options could be overwritten.
2004-02-13 16:05:09 +02:00
bar@bar.intranet.mysql.r18.ru
d0b456fead Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-02-13 18:04:08 +04:00
hf@deer.(none)
345dc4d1ab This line missed in the fix 2004-02-13 18:04:07 +04:00
bar@bar.intranet.mysql.r18.ru
3bdb96d33e Bug UTF8 breaks primary keys for cols > 85 characters 2004-02-13 17:58:02 +04:00
hf@deer.(none)
32039398ef Fix for (field->def contains invalid values) 2004-02-13 17:20:56 +04:00