Commit graph

9641 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
0662489344 removed double procedure deletetion 2003-09-13 10:30:41 +03:00
bell@sanja.is.com.ua
462dba1b5b fixed memory leak (now JOIN cleaning procedure always called) 2003-09-13 02:07:06 +03:00
Sinisa@sinisa.nasamreza.org
0088e1c657 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-09-12 19:23:47 +03:00
Sinisa@sinisa.nasamreza.org
a424ccee17 Fix for a bug #1231
Parse error caused global ORDER BY to be initialized although it should
not have been.
2003-09-12 19:17:30 +03:00
hf@deer.(none)
e63e2229b6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-12 19:36:42 +05:00
hf@deer.(none)
9f3996cde9 SCRUM:
#977 Prepared statements in embedded library
2003-09-12 19:35:34 +05:00
hf@deer.(none)
efce59fc3f Monty's merge bug fixed 2003-09-12 13:44:41 +05:00
monty@mashka.mysql.fi
c477002fd4 Fix results for mix_innodb_myisam_binlog
Optimize calls to current_thd
2003-09-12 05:54:12 +03:00
monty@mashka.mysql.fi
04c43fca8e Optimize thai character handling
Remove sel000xxxx tests
After merge fixes
2003-09-12 04:18:07 +03:00
guilhem@mysql.com
5abd722658 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-11 22:26:00 +02:00
monty@mashka.mysql.fi
7538242e4f merge with 4.1 tree 2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes.
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
ram@mysql.r18.ru
9de77cc983 Fix for the bug #1200: Can't start MySQL if bind-address set to hostname that starts with a number. 2003-09-11 13:50:18 +05:00
hf@deer.(none)
f434b329f5 SCRUM
embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'
2003-09-11 09:46:31 +05:00
monty@mashka.mysql.fi
62103fff40 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-11 06:10:09 +03:00
monty@mashka.mysql.fi
223a966763 Remove not used define (my_strxfrm) 2003-09-11 06:09:34 +03:00
lenz@mysql.com
541189e746 - Added option "--skip-name-resolve" to mysql_install_db to be able to
use the local machine's IP address instead of the host name when 
   building the initial grant tables if "skip-name-resolve" has been
   specified in my.cnf. This can be helpful on FreeBSD to avoid
   thread-safety problems with the FreeBSD resolver libraries.
   (Thanks to Jeremy Zawodny for the patch)
2003-09-10 17:48:43 +02:00
guilhem@mysql.com
332ac06629 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-10 17:15:21 +02:00
lenz@mysql.com
57290ee65f - Updated version number to 4.0.16 now that 4.0.15 has been released
- tagged ChangeSet 1.1556 as mysql-4.0.15
2003-09-10 16:48:57 +02:00
bar@bar.mysql.r18.ru
4f3474922b Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-10 17:26:09 +05:00
bar@bar.mysql.r18.ru
6fa45cec53 mysql_create_table now accepts field lengths in CREATE form, not in internal form.
This is to simplify fixing indexes to mean number of chars rather than bytes too.
2003-09-10 17:25:26 +05:00
hf@deer.(none)
b2a1bf2ef6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-09-10 13:00:19 +05:00
hf@deer.(none)
fd77d78804 SCRUM: embedde library
Minor fixes
2003-09-10 12:58:26 +05:00
bell@sanja.is.com.ua
312755e115 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-09-10 10:25:29 +03:00
hf@deer.(none)
d9ef1585d1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-09-10 12:10:30 +05:00
hf@deer.(none)
69283f8091 SCRUM: embedded library
mysql_fetch_length fixed for embedded library. Now data length is stored
before the data. Pointers in row still points to the data so you have to
get *(uint*)(data_ptr - sizeof(uint)) to get data length
2003-09-10 12:09:24 +05:00
bell@sanja.is.com.ua
23ad0cfbbb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-09-10 09:43:30 +03:00
ram@mysql.r18.ru
4b1c22c57e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-10 11:19:39 +05:00
ram@mysql.r18.ru
d0acda900c Fix for the fix for the bug #1209: SELECT DATABASE(). 2003-09-10 11:19:01 +05:00
bell@sanja.is.com.ua
a837b71e6c after merge fix 2003-09-09 23:07:39 +03:00
bell@sanja.is.com.ua
ad07ffbf6d merge 2003-09-09 22:26:19 +03:00
monty@mashka.mysql.fi
99490870e6 Cleaned up last bug fixes
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
2003-09-09 20:06:50 +03:00
bell@sanja.is.com.ua
a0bf98b7a4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1
2003-09-09 17:38:21 +03:00
Sinisa@sinisa.nasamreza.org
5e32805713 Fix for a bug #1226.
Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.
2003-09-09 15:23:38 +03:00
bell@sanja.is.com.ua
813d81c726 removing additional IN subquery condition
fixed IN optimisation bug
2003-09-08 21:58:09 +03:00
hf@deer.(none)
434cea193d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2003-09-08 21:47:41 +05:00
vva@eagle.mysql.r18.ru
579edcd481 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
2003-09-08 12:47:40 -04:00
vva@eagle.mysql.r18.ru
7ee7ce5556 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
2003-09-08 12:46:16 -04:00
vva@eagle.mysql.r18.ru
314d7c401a Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0
2003-09-08 12:16:17 -04:00
vva@eagle.mysql.r18.ru
00aee0ba4b Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0
2003-09-08 12:15:17 -04:00
serg@serg.mylan
536b8405b7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-08 17:48:00 +02:00
serg@serg.mylan
503e7c930c Merge 2003-09-08 16:55:30 +02:00
hf@deer.(none)
90bd948e1e fix for #1219 2003-09-08 18:49:23 +05:00
ram@mysql.r18.ru
44d6102f81 Fix for the bug #1209: SELECT DATABASE(). 2003-09-08 17:30:53 +05:00
hf@deer.(none)
cf0c41aab4 fix for #1218 2003-09-08 17:00:39 +05:00
hf@deer.(none)
9807a3fa55 Trimming of embedded library code 2003-09-08 15:08:53 +05:00
hf@deer.(none)
05f53a0422 fix for #1211 2003-09-08 14:46:44 +05:00
ram@mysql.r18.ru
1f19af41a3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-08 14:43:54 +05:00
hf@deer.(none)
9e83f314c3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-09-08 13:13:17 +05:00