hf@deer.mysql.r18.ru
3517febe97
Resolving merge conflicts
2002-12-12 12:49:56 +04:00
hf@deer.mysql.r18.ru
dcb5293576
Some fixes
2002-12-12 12:16:34 +04:00
bar@bar.mysql.r18.ru
b4fcdaa276
Preparation to charset dependant test_if_int and test_if_real
2002-12-11 17:42:48 +04:00
bar@bar.mysql.r18.ru
6f5098c5c9
Always use latin1 for acl
2002-12-11 17:20:40 +04:00
bar@bar.mysql.r18.ru
40f828d5f1
Some system_charset_info and default_charset_info were replaced by my_charset_latin1
2002-12-11 17:12:55 +04:00
bar@bar.mysql.r18.ru
34033b9389
Use of charset dependant num->string conversion routines
2002-12-11 16:04:46 +04:00
bar@bar.mysql.r18.ru
e870df661d
Use of new num->str functions
...
fix in ucs2 charset
2002-12-11 15:29:23 +04:00
bar@bar.mysql.r18.ru
2204f764ce
sql/sql_string.cc@1.39
...
New num->str functions
strings/ctype-simple.c@1.16
New num->str functions
strings/ctype-utf8.c@1.18
New num->str functions
2002-12-11 15:26:49 +04:00
bar@bar.mysql.r18.ru
857d447e23
More new style str->num
2002-12-10 12:43:17 +04:00
bar@bar.mysql.r18.ru
257cd4ab78
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-12-10 10:55:19 +04:00
bar@bar.mysql.r18.ru
c1486c2c17
More use of new str->num conversion routines
2002-12-09 17:57:17 +04:00
peter@mysql.com
c63561b22d
Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/pz/mysql/mysql-4.1-root
2002-12-09 15:30:15 +03:00
bar@bar.mysql.r18.ru
59069e60f2
More use of new str->num conversion routines
2002-12-09 15:58:33 +04:00
bar@bar.mysql.r18.ru
632dff01d1
More use of new str->num functions
2002-12-09 15:45:05 +04:00
peter@mysql.com
9be360eead
Minor new auth fixes
2002-12-09 14:29:17 +03:00
bar@bar.mysql.r18.ru
43786feed1
More use of new str->number routines
2002-12-09 14:58:24 +04:00
bar@bar.mysql.r18.ru
241f4143e8
More use of new string->number conversion routines
2002-12-09 14:31:11 +04:00
bar@bar.mysql.r18.ru
072abca49b
Use of new string->number conversion routines
2002-12-09 14:08:42 +04:00
bell@sanja.is.com.ua
8762e83485
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2002-12-08 17:28:11 +02:00
pem@mysql.com
64e321d0df
Made sql_yacc.yy work with bison 1.75.
2002-12-07 12:35:57 +01:00
bell@sanja.is.com.ua
e7b71d6da8
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2002-12-07 10:53:52 +02:00
bell@sanja.is.com.ua
336f66cde5
probably fix depended subselect cleanup
...
fixed cleanup on error message handling
2002-12-07 10:53:33 +02:00
venu@myvenu.com
9100688c17
item.cc:
...
Fix for save_in_field to take extra bool argumnet (4.0 merge compatibility)
2002-12-06 23:39:11 -08:00
monty@mashka.mysql.fi
7e312565c3
Remove usage of acl_getroot() in embedded server.
...
Fixed compilation problem when OPENSSL was enabled.
2002-12-06 22:01:12 +02:00
monty@mashka.mysql.fi
f1d35b29bc
merge fix
2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
35ff08c2af
After merge fixes
...
Added THD to add_to_xxx_list() functions for faster parsing.
2002-12-06 21:11:27 +02:00
bell@sanja.is.com.ua
f1858ec331
fixed bug of PROCEDURE in same query with subselects
...
prohibited using procedure inside subquery
fixed error handling of procedure analize
2002-12-06 00:40:28 +02:00
venu@myvenu.com
9e4dc3fba5
sql_error.cc:
...
make tests to go ; becuase of DROP TABLE ID EXISTS warnings
2002-12-05 12:34:22 -08:00
venu@myvenu.com
7ffe639d6e
Merge work.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/bk/src-4.1
2002-12-05 11:34:15 -08:00
monty@mashka.mysql.fi
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
monty@mashka.mysql.fi
7d681c4449
Copy arguments given to mysql_server_init()
...
Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors.
2002-12-05 16:38:49 +02:00
peter@mysql.com
dac10a8c81
Fix minor bug and add test of connection with new/old/without passwords
2002-12-05 14:01:15 +03:00
monty@mashka.mysql.fi
2435dce96d
Merge with 3.23
2002-12-05 03:52:53 +02:00
monty@mashka.mysql.fi
fc06433a69
Removed copying of parameters as this leads to memory leaks in embedded server.
...
Fixed 'not initialized' memory error.
2002-12-05 03:40:33 +02:00
peter@mysql.com
3ee8bee22f
Basically minor code optimizations and cleanups
2002-12-05 03:55:29 +03:00
peter@mysql.com
1d920529a8
SCRAM Remove spaces from most changed files.
...
This alters not only my code so it looks like I'm not only one adding the spaces.
2002-12-05 01:14:51 +03:00
Sinisa@sinisa.nasamreza.org
5331a7ef8e
some code cleanup
2002-12-04 21:39:15 +02:00
Sinisa@sinisa.nasamreza.org
be6b50e152
Merge sinisa@work.mysql.com:/home/bk/mysql
...
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-04 20:52:42 +02:00
Sinisa@sinisa.nasamreza.org
d527bfbd59
A fix for double free'd pointer bug ...
2002-12-04 20:51:18 +02:00
lenz@mysql.com
1935183975
- Portability fixes for HP compiler on HPUX11 (backport from 4.0 tree)
...
- sql_analyse.cc: Fixed bug in decimal handling
2002-12-04 16:16:06 +01:00
Sinisa@sinisa.nasamreza.org
cb6d9e0c88
Merge sinisa@work.mysql.com:/home/bk/mysql
...
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-04 16:13:32 +02:00
Sinisa@sinisa.nasamreza.org
93c7ceaaec
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-12-04 15:28:16 +02:00
Sinisa@sinisa.nasamreza.org
dd2012067e
A fix for the bug in a SELECT with joined tables with ORDER BY and
...
LIMIT clause when filesort had to be used.
In that case LIMIT was applied to filesort of one of the tables,
although it could not be.
This fix solved problems with LEFT JOIN too...
2002-12-04 15:27:08 +02:00
peter@mysql.com
5fa02daa69
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-04 16:26:29 +03:00
venu@myvenu.com
91558620e0
Return a warning for DROP DATABASE/TABLE IF EXISTS <non_existing_db/table(s)>
2002-12-04 03:19:08 -08:00
serg@serg.mysql.com
6dfd1d867e
merged
2002-12-04 10:16:19 +01:00
bell@sanja.is.com.ua
ed8cc2a844
changing in Item_row according last review (SCRUM)
2002-12-04 11:01:48 +02:00
serg@serg.mysql.com
9e61e636be
proper casting in COM_TABLE_DUMP (backported from 4.0)
2002-12-04 09:54:58 +01:00
bell@sanja.is.com.ua
91bd1e4cc5
fixed error message
2002-12-04 01:32:45 +02:00
serg@serg.mysql.com
33de7e55f9
Security bug: password length check should be in check_user, not check_connections(),
...
otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun
2002-12-04 00:27:09 +01:00