mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
10882 commits 2791 branches 343 tags 1.7 GiB
Commit graph

5547 commits

Author SHA1 Message Date
hf@deer.(none)
acc84f0391 define name fixed 2004-01-23 20:52:35 +04:00
hf@deer.(none)
1562dafa5b Error message added 2004-01-23 20:03:42 +04:00
hf@deer.(none)
52f2529536 Conflicts resolved 2004-01-23 20:00:10 +04:00
hf@deer.(none)
c13f757c43 SCRUM 
WL#1163 (Make spatial code separable)
fixes before the push
 2004-01-23 19:54:22 +04:00
hf@deer.(none)
215a65b1fd SCRUM 
wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions
 2004-01-23 16:02:57 +04:00
Sinisa@sinisa.nasamreza.org
6315a4874f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-22 22:44:05 +02:00
Sinisa@sinisa.nasamreza.org
6f1342a61d Fix for a bug #2422, where CONVERT(expr, cast) was masked by 
CONVERT(expr, expr, expr);
 2004-01-22 22:13:24 +02:00
serg@serg.mylan
fbf4299b5c Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-01-22 14:46:54 +01:00
Sinisa@sinisa.nasamreza.org
0bdf713a85 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-22 14:18:12 +02:00
serg@serg.mylan
c4a52e4ac4 enforcing coding style to cause an intentional merge conflict with 4.0 2004-01-22 12:55:37 +01:00
igor@rurik.mysql.com
a2209361d6 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-01-21 12:38:23 -08:00
bar@bar.intranet.mysql.r18.ru
03d60deed7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2004-01-21 15:48:32 +04:00
hf@deer.(none)
3d65182c24 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-01-21 15:48:31 +04:00
hf@deer.(none)
97fbbcd17c yet another cleanup()-related fix 2004-01-21 15:47:47 +04:00
bar@bar.intranet.mysql.r18.ru
daf0bba236 sql_string.cc: 
Rewrote to comply the coding style
 2004-01-21 14:32:02 +04:00
bar@bar.intranet.mysql.r18.ru
03d00c7da9 Further fixes for 2390: ucs2 alignment 2004-01-21 14:15:19 +04:00
bell@sanja.is.com.ua
03d7217f77 Merge 2004-01-20 19:23:28 +02:00
bell@sanja.is.com.ua
2a55a7684f for multy-delete command used same algorithm of table reference (alias) 2004-01-20 19:16:18 +02:00
hf@deer.(none)
5b32ce5b0d Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.1676
 2004-01-20 21:00:29 +04:00
hf@deer.(none)
37abf689ec Pack of changes about 'cleanup()'-s 
Some errorneous code trimmed
 2004-01-20 20:55:47 +04:00
Sinisa@sinisa.nasamreza.org
ab4042adc1 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-20 17:49:10 +02:00
igor@rurik.mysql.com
ab28521dff Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-01-19 23:00:46 -08:00
monty@mysql.com
b078d2df64 merge 2004-01-20 00:15:01 +01:00
monty@mysql.com
0eb6070068 Code cleanup 
Fixed bug in optimizer where it didn't choose right table order in some cases
 2004-01-19 23:51:17 +01:00
konstantin@mysql.com
eb0ae211c5 more clear (grammar mistake) 2004-01-19 23:34:40 +03:00
konstantin@oak.local
c74cd37cd1 More comments to THD::lock and THD::locked_tables commented 2004-01-19 23:34:39 +03:00
vva@eagle.mysql.r18.ru
6b94ea53d5 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
 2004-01-20 00:34:38 +04:00
vva@eagle.mysql.r18.ru
12008677de Fixed bug #2310 "INET_ATON handles short-forms addresses incorrectly" 2004-01-20 00:32:25 +04:00
hf@deer.(none)
7dda8c102f Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.1676
 2004-01-19 21:06:27 +04:00
hf@deer.(none)
c29e27dabc Code cleanup 
Superfluous line removed
 2004-01-19 21:05:26 +04:00
hf@deer.(none)
1f8eb40310 Code cleanup (working on PS & cleanup() code) 
Item & changed with Item* in Item_xxx constructors
tables_list.first -> get_table_list()
 2004-01-19 19:53:25 +04:00
bar@bar.intranet.mysql.r18.ru
d921a05ec6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2004-01-19 19:21:07 +04:00
bar@bar.intranet.mysql.r18.ru
f802ec0215 UCS-2 aligning 0xAA -> 0x00AA 2004-01-19 19:16:30 +04:00
serg@serg.mylan
6985f346b9 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-01-19 14:23:18 +01:00
serg@serg.mylan
cf80041e09 field length convertion (bytes->chars) should be done with rounding UP. 2004-01-19 14:22:38 +01:00
Sinisa@sinisa.nasamreza.org
aa933d382b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-19 14:15:40 +02:00
ram@gw.mysql.r18.ru
e289783cf8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2182
 2004-01-19 13:00:51 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
aa31e98c90 Fix deprecation warning - database_engine => storage_engine 2004-01-18 22:30:35 +00:00
Sinisa@sinisa.nasamreza.org
8959551451 merge fixes 2004-01-17 17:18:32 +02:00
bell@sanja.is.com.ua
0b7ebbb57d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-insert-4.1
 2004-01-17 15:28:56 +02:00
bell@sanja.is.com.ua
7277c4e95d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-exists-4.1
 2004-01-17 14:43:56 +02:00
bell@sanja.is.com.ua
48686f89e6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ft_derived-4.1
 2004-01-17 14:03:22 +02:00
bell@sanja.is.com.ua
242e8dbbbb merge 2004-01-17 13:13:48 +02:00
bell@sanja.is.com.ua
c04fd7b177 switched to new syntax (TYPE->ENGINE) 
check of memory allocation operation was added
 2004-01-17 13:00:46 +02:00
bell@sanja.is.com.ua
bcbc9ff22f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
 2004-01-17 11:53:04 +02:00
bell@sanja.is.com.ua
41323e8b76 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1
 2004-01-17 10:02:01 +02:00
Sinisa@sinisa.nasamreza.org
9c232685d6 Two bug fixes 2004-01-16 20:05:08 +02:00
Sinisa@sinisa.nasamreza.org
c4223f5387 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-15 22:05:24 +02:00
hf@deer.(none)
6dcda5153b SCRUM: 
WL#1163 (Making spatial code optional)
Pack of changes to do in sql/ code.
 2004-01-15 21:06:22 +04:00
bar@bar.intranet.mysql.r18.ru
8872fa0458 field.cc: 
http://bugs.mysql.com/bug.php?id=2218
  updating utf-8 text field generate nonsense chars
  Fix for the above bug.
 2004-01-15 15:58:06 +04:00