Commit graph

7005 commits

Author SHA1 Message Date
venu@myvenu.com
7d4fd47455 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-22 15:16:23 -08:00
serg@serg.mysql.com
1fe18bea46 fixed "double Procedure::~Procedure" bug 2003-01-23 00:03:40 +01:00
venu@myvenu.com
0a0f75b840 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-22 11:31:13 -08:00
hf@deer.mysql.r18.ru
524e33eb59 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default
2003-01-22 20:51:54 +04:00
pem@mysql.com
d9d5ddb52d Fixed bug in Protocol::convert_str() (missing return caused "Out of memory" errors
when optimized).
2003-01-22 17:51:53 +01:00
serg@serg.mysql.com
cd0a90299d Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-01-22 17:51:52 +01:00
vva@eagle.mysql.r18.ru
1098d0a0e9 correction for compiling on Linux Suse 7.2 2003-01-22 20:51:51 +04:00
hf@deer.mysql.r18.ru
e2d991795c SCRUM
DEFAULT in SELECT & UPDATE corrections
2003-01-22 20:08:12 +04:00
serg@serg.mysql.com
897b165bda workaround for gcc bug 2003-01-22 15:05:37 +01:00
serg@serg.mysql.com
3b1ed68875 auto-generated binary files deleted 2003-01-22 13:24:26 +01:00
lenz@mysql.com
d95d2e3393 - removed duplicate code (merge error) 2003-01-22 12:13:51 +01:00
venu@myvenu.com
93d4055e21 Remove bind_length + Fix the client-test 2003-01-22 01:30:13 -08:00
lenz@mysql.com
a6f6f19b51 - tagged ChangeSet 1.1509 as "mysql-4.0.9"
- bumped up version number in configure.in to 4.0.10-gamma
2003-01-21 22:36:56 +01:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
4fd9bad4cc Update to VC++ build files 2003-01-21 21:22:45 +02:00
serg@serg.mysql.com
49580a5168 fulltext2.test: --enable/disable_warnings 2003-01-21 20:11:24 +01:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
serg@serg.mysql.com
3f55032c12 merged 2003-01-21 19:37:38 +01:00
serg@serg.mysql.com
0dff67cba2 Two-level index structure for FULLTEXT indexes 2003-01-21 19:24:34 +01:00
hf@deer.mysql.r18.ru
87681bb85e Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default
2003-01-21 20:24:22 +04:00
hf@deer.mysql.r18.ru
9fb261e384 SCRUM
Default in UPDATE & SELECT
2003-01-21 20:20:46 +04:00
serg@serg.mysql.com
da14d258e8 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-01-21 16:30:43 +01:00
Sinisa@sinisa.nasamreza.org
4f50b80274 a symlink that was missing ... 2003-01-21 17:30:42 +02:00
serg@serg.mysql.com
0a4ca15dc6 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-01-21 16:11:07 +01:00
serg@serg.mysql.com
f028989bad fixed double-free bug in COM_CHANGE_USER 2003-01-21 16:07:31 +01:00
Sinisa@sinisa.nasamreza.org
8b82ebc450 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-01-21 16:11:01 +02:00
Sinisa@sinisa.nasamreza.org
74f478f9a5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-21 15:54:36 +02:00
bell@sanja.is.com.ua
62c02d4b45 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
2003-01-21 15:31:04 +02:00
Sinisa@sinisa.nasamreza.org
70dfa42258 resolve fix 2003-01-21 14:57:33 +02:00
Sinisa@sinisa.nasamreza.org
3e302c524e A small fix for privilege system as reported by HF. 2003-01-21 14:50:55 +02:00
bell@sanja.is.com.ua
8aabee290d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
2003-01-21 14:03:30 +02:00
bell@sanja.is.com.ua
372e2130e4 fixed test of cardinality 2003-01-21 13:55:26 +02:00
hf@deer.mysql.r18.ru
4fa14086ad fix removation 2003-01-21 15:54:14 +04:00
heikki@hundin.mysql.fi
ed62ee1c74 os0file.c:
The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits
2003-01-21 13:37:41 +02:00
hf@deer.mysql.r18.ru
7d20900c6d Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1
2003-01-21 09:46:07 +04:00
hf@deer.mysql.r18.ru
e757e47e7f small fix 2003-01-21 09:45:05 +04:00
heikki@hundin.mysql.fi
d3145a9135 ha_innobase.cc:
Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
2003-01-21 00:44:49 +02:00
heikki@hundin.mysql.fi
ff4ef4c4e7 ha_innodb.cc:
Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
2003-01-21 00:38:55 +02:00
heikki@hundin.mysql.fi
3e6bfd724f os0file.c:
Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows
2003-01-21 00:18:48 +02:00
venu@myvenu.com
fc94598773 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-20 14:07:10 -08:00
venu@myvenu.com
643264db2c Multi query fix the recursion (SCRUM - For Monty) 2003-01-20 14:00:50 -08:00
heikki@hundin.mysql.fi
a4a95cb217 ha_innodb.cc:
Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1
2003-01-20 23:39:28 +02:00
monty@mashka.mysql.fi
6522ee6c98 Merge with 4.0 (Fix bug in LEFT JOIN and EXPLAIN on empty table) 2003-01-20 18:48:10 +02:00
monty@mashka.mysql.fi
fab7f39e42 Fixed bug with EXPLAIN on empty table 2003-01-20 18:17:14 +02:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677 SCRUM
embedded-related changes
2003-01-20 18:47:25 +04:00
wax@mysql.com
272354b1a2 delete name_length and change an assign of udf.name (SCRUM) 2003-01-20 02:58:21 +05:00
monty@mashka.mysql.fi
a5e30be0d0 Fixed bug in LEFT JOIN with impossible ON/WHERE expression 2003-01-19 17:15:14 +02:00
monty@mashka.mysql.fi
d14db3961d Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-01-19 02:28:36 +02:00
monty@mashka.mysql.fi
12ab0651c6 merge with 4.0 to get bug fix for SHOW PROCESSLIST + connected slave 2003-01-19 02:28:07 +02:00