mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
10720 commits 2794 branches 343 tags 1.5 GiB
Commit graph

5427 commits

Author SHA1 Message Date
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
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
serg@serg.mylan
c4a52e4ac4 enforcing coding style to cause an intentional merge conflict with 4.0 2004-01-22 12:55:37 +01: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
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
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
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
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
bar@bar.intranet.mysql.r18.ru
55d84200f4 item_strfunc.cc: 
Unnesessary copying was fixed
 2004-01-15 12:12:55 +04:00
jani@rhols221.adsl.netsonic.fi
1cc08ed699 Fixed Bug#2123, mysqld segmentation faulted when it tried to 
open a file that already existed. The problem was that end_io_cache()
was called even if init_io_cache() was not. This affected both
OUTFILE and DUMPFILE (both fixed). Sometimes wrongly aligned pointer was freed,
sometimes mysqld core dumped.

Other problem was that select_dump::send_error removed the dumpfile,
even if it was created by an earlier run, or by some other program, if
the file permissions just permitted it. Fixed it so that the file will
only be deleted, if an error occurred, but the file was created by mysqld
just a moment ago, in that thread.

On the other hand, select_export did not handle the corresponding garbage
file at all. Both fixed.

After these fixes, a big part of the select_export::prepare and select_dump::prepare
code became identical. Merged the code into a new function called create_file(),
which is now called by the two latter functions.

Regards,
Jani
 2004-01-15 06:48:31 +02:00
serg@serg.mylan
59472975a0 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-01-14 16:40:51 +01:00
bar@bar.intranet.mysql.r18.ru
9b9690dfaa 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-14 17:33:50 +04:00
bar@bar.intranet.mysql.r18.ru
cc21589839 item_strfunc.cc: 
We don't need to copy if start is 0, we can return the original value.
 2004-01-14 17:26:30 +04:00
bell@sanja.is.com.ua
4714f690f1 assigned correct lex->current_select for derived tables (BUG#2349) 
moved LIMIT initialialization, because it is need only for single select derived table
 2004-01-14 15:15:42 +02:00
serg@serg.mylan
ea61b7886b Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-01-14 14:08:56 +01:00
ram@gw.mysql.r18.ru
7b652e9a29 fix for the 2361 bug: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key 
"PRIMARY" has been replaced by primary_key_name.
 2004-01-14 16:01:55 +04:00
serg@serg.mylan
f1c7527b60 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
 2004-01-14 12:47:04 +01:00
serg@serg.mylan
fd352c2284 bugs #2280, #2281 - show create table should always return a valid sql statement 2004-01-14 11:52:25 +01:00
ram@gw.mysql.r18.ru
4b91183cde Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2361
 2004-01-14 14:36:57 +04:00
bar@bar.intranet.mysql.r18.ru
362d697c9f item_strfunc.cc: 
Comment typo fix
  ,
 2004-01-14 14:02:51 +04:00
bar@bar.intranet.mysql.r18.ru
81f10f9f07 item_strfunc.cc: 
Unnesessary code was removed. Comment was added.
 2004-01-13 17:27:21 +04:00