mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 14:32:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6842 commits 2783 branches 343 tags 1.6 GiB
Commit graph

720 commits

Author SHA1 Message Date
monty@mashka.mysql.fi
803dff1002 Merge with 4.0.8 2003-01-06 02:04:52 +02:00
monty@mashka.mysql.fi
f9772317ee merge 2003-01-04 15:40:55 +02:00
monty@mashka.mysql.fi
6d6f051178 Added support for DROP TEMPORARY TABLE 
Removed mysql_warnings() API function.
Post merge fixes.
 2003-01-04 15:37:20 +02:00
monty@mashka.mysql.fi
6d5ad61a11 Added support for max_allowed_packet in option files read by mysql_option() 
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.
 2003-01-04 15:17:16 +02:00
bar@bar.mysql.r18.ru
a172e5ad2a Some changes to separate charset and collation terms 2003-01-04 14:12:20 +04:00
peter@mysql.com
7aba78533b Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2003-01-03 15:39:16 +03:00
venu@myvenu.com
5f4a7c1971 Missed commit 2003-01-03 04:12:34 -08:00
bar@bar.mysql.r18.ru
f6d427d7df User data 2003-01-03 12:30:01 +04:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
peter@mysql.com
3b425c8ba5 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2003-01-01 20:11:18 +03:00
bar@bar.mysql.r18.ru
eb87b8a1bd XML parser 2002-12-31 13:00:41 +04:00
peter@mysql.com
6e35c1a95e Add proper error message for old client connecting new server using user which has password in 
new format SCRUM
 2002-12-26 19:12:57 +03:00
bar@bar.mysql.r18.ru
852508a4cf mysql_com.h: 
ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!
 2002-12-20 16:21:22 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3 Merge 2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
c3053148f4 BINARY_FLAG has been restored. 
It's needed by ODBC code.
 2002-12-19 14:36:05 +04:00
hf@deer.mysql.r18.ru
bb67600df4 Merging 2002-12-17 19:57:23 +04:00
vva@eagle.mysql.r18.ru
f3871cf9b4 Many init commands on connect 2002-12-17 19:13:07 +04:00
hf@deer.mysql.r18.ru
e3b3b68307 Big purge about embedded library (scrum) 2002-12-16 17:33:29 +04:00
hf@deer.mysql.r18.ru
3517febe97 Resolving merge conflicts 2002-12-12 12:49:56 +04:00
bar@bar.mysql.r18.ru
a345447ad0 Preparing for charset dependant int10_to_str 2002-12-11 12:30:05 +04:00
serg@serg.mysql.com
94cb1daa52 ANALYZE for MERGE 2002-12-10 00:06:05 +01:00
serg@serg.mysql.com
b42eff16cb bulk insert code optimized 2002-12-07 22:40:20 +01: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
f1d35b29bc merge fix 2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02: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
serg@serg.mysql.com
44db958ba2 new client error added: CR_MALFORMED_PACKET 2002-12-04 17:37:51 +01: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
bell@sanja.is.com.ua
91bd1e4cc5 fixed error message 2002-12-04 01:32:45 +02:00
Sinisa@sinisa.nasamreza.org
5483796c50 Proper handling of ORDER BY table.column in UNION's 2002-12-02 20:18:51 +02:00
peter@mysql.com
1bf744911f Megrge new changes in... 2002-12-01 11:18:19 +03:00
peter@mysql.com
a24258375a SCRUM: Montymise code 
fix mysql_change_user() for old clients
 2002-11-30 20:58:53 +03:00
peter@mysql.com
54ff0efe7c SCRUM: Secure auth 
Implement mysql_change_user
Get rid of double user search at authentication
Some cleanups
 2002-11-30 16:31:58 +03:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
peter@mysql.com
7e6977808f Correct bug which exposed itself in rpl000017 
Commit for merge
 2002-11-29 21:34:13 +03:00
monty@mashka.mysql.fi
6603d75213 New multi-table-update code 
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1  (We should use TRUE and FALSE)
 2002-11-29 16:40:18 +02:00
Sinisa@sinisa.nasamreza.org
5b7a2f56ee many, many changes 2002-11-29 15:22:47 +02:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
bar@bar.mysql.r18.ru
24cf562ec5 mysql.h: 
renamed arg name to avoid a warning that it shadows global variable
 2002-11-29 10:17:43 +04:00
wax@mysql.com
8efd5648ef Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi 2002-11-29 02:51:08 +05:00
bell@sanja.is.com.ua
0b8054ac8c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
 2002-11-28 20:59:21 +02:00
bell@sanja.is.com.ua
fcb0b8815b merging 2002-11-28 20:12:14 +02:00
venu@myvenu.com
aafcbf3450 Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2002-11-28 10:02:01 -08:00
venu@myvenu.com
5aff325ce3 Get rid of pbool from my_list.h; and avoid using the my_global.h for clients 2002-11-28 09:56:26 -08:00
bell@sanja.is.com.ua
b8b7d0b03b fixed * without tables in IN bug 
fixed sunction-test select in IN bug
fixed unions in subselect bug
 2002-11-28 19:29:26 +02:00
Sinisa@sinisa.nasamreza.org
8a53d1ca6a adding mandatory aliases for derived tables as per SQL-99 
doing it in sql_yacc.yy does not work
this commit contains fixes for other tests
there are fixes in subselect test which will have to be changed
once fix_fields is fixed to work with aliased derived tables
 2002-11-28 19:19:21 +02:00
wax@mysql.com
ff368e9590 Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi 2002-11-28 15:24:55 +05:00
bell@sanja.is.com.ua
4be2cfd62d merging 2002-11-27 19:31:11 +02:00
bar@bar.mysql.r18.ru
95930f129e new string-to-number functions 2002-11-27 18:08:31 +04:00
bar@bar.mysql.r18.ru
61141a30ee Preparing to use better string-to-number functions to avoid c_ptr() call, 
wich is slower and is not ucs2 compatible
 2002-11-27 15:47:39 +04:00
venu@myvenu.com
70abdf3a51 Merge myvenu.com:/home/venu/bk/src-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2002-11-26 18:54:17 -08:00
venu@myvenu.com
e01a6c832d select_test.c, insert_test.c: 
Added my_global.h to compile after my_list.h is added to mysql.h
sql_prepare.cc:
  Handle close stmt from client
  Minor fixups to make SET variable=? to work
sql_parse.cc:
  Added missed COM_CLOSE_STMT
mysql_priv.h:
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
libmysql.c:
  Clean all open stmts during mysql_close() implicitly
 2002-11-26 18:51:38 -08:00
serg@serg.mysql.com
e8c7830e0f Merge work:/home/bk/mysql-4.1 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2002-11-25 22:22:13 +01:00
serg@serg.mysql.com
5b57077778 myisammrg::index_next_same 2002-11-25 22:18:44 +01:00
peter@mysql.com
d2aa1fb8e7 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-11-24 17:35:24 +03:00
peter@mysql.com
925155cf5a Merge.... 2002-11-24 17:26:26 +03:00
peter@mysql.com
35ccfd0b42 SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit 
done for merge with newer version of code.
 2002-11-24 17:07:53 +03:00
bell@sanja.is.com.ua
1b62dc0223 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
 2002-11-23 20:32:02 +02:00
venu@myvenu.com
ec17cac968 Missed include/ files 2002-11-22 11:58:20 -08:00
bell@sanja.is.com.ua
4d7a880196 after merging fix 2002-11-21 16:04:59 +02:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
bell@sanja.is.com.ua
2990b17625 merging 2002-11-21 12:05:52 +02:00
bell@sanja.is.com.ua
2eb623a4f0 prevent using references on sum function (except HAVING clouse of current select) and forward references 2002-11-21 11:01:33 +02:00
monty@mashka.mysql.fi
305d16a7cb Automatic conversion from CHAR(length) to BLOB when length > 255 
New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0
 2002-11-21 02:07:14 +02:00
monty@mashka.mysql.fi
e65ddf3fc3 Try to optimize the cache buffer size needed for bulk_insert 
Fix for shutdown on Mac OS X
 2002-11-20 22:56:57 +02:00
bell@sanja.is.com.ua
bfcd4a7197 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
 2002-11-19 17:34:38 +02:00
wax@mysql.com
625b57b556 Move MI_SORT_PARAM and BUFFPEK to myisamdef.h, delete KEY_STORE, change functions 
of store keys to temp. file
 2002-11-17 05:41:42 +05:00
serg@serg.mysql.com
f2aab61a60 Merge serg.mysql.com:/usr/home/serg/Abk/mysql 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2002-11-17 00:36:28 +01:00
serg@serg.mysql.com
361db3ed44 Delete: include/.my_sys.h.swp 2002-11-17 00:35:13 +01:00
serg@serg.mysql.com
08e6939254 typelib.h is required by mysql.h and should be installed 2002-11-17 00:31:57 +01:00
bell@sanja.is.com.ua
f3ad93d3c1 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
 2002-11-16 23:30:14 +02:00
monty@mashka.mysql.fi
1a96948e81 Small improvement to alloc_root 
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
 2002-11-16 20:19:10 +02:00
bell@sanja.is.com.ua
7a9f47759e basic row Items (SCRUM) 2002-11-15 20:32:09 +02:00
bar@bar.mysql.r18.ru
41554da7ff move like_range into CHARSET_INFO structure 2002-11-15 11:44:23 +04:00
wax@mysql.com
8827109cd0 Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4sm 2002-11-15 00:18:37 +05:00
wax@mysql.com
e91d1b2cbe Add shared memory protocol and option --protocol 2002-11-15 00:16:30 +05:00
bar@bar.mysql.r18.ru
76ed2fc40a removed unused function 
some bug fixes
 2002-11-14 16:47:48 +04:00
bar@bar.mysql.r18.ru
237e2ca001 New wildcmp() function in CHARSET_INFO structure 2002-11-14 16:07:29 +04:00
monty@mashka.mysql.fi
7a70332836 Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
bell@sanja.is.com.ua
b724f02cd4 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
 2002-11-14 00:26:40 +02:00
bell@sanja.is.com.ua
41d9311621 fixed cyclic reference bug 2002-11-14 00:26:18 +02:00
bar@bar.mysql.r18.ru
f628df0768 Some macros to make life easier 2002-11-13 17:58:07 +04:00
bar@bar.mysql.r18.ru
ae7d6838b2 Preparing to embed string to number conversion functions into charset structure 2002-11-13 17:13:29 +04:00
bell@sanja.is.com.ua
57541e72c5 fixed 2 typo in BUG_TABLES using 
remuved 'unstable' variable from test
 2002-11-12 15:25:09 +02:00
lenz@mysql.com
549aeb3ac4 include/mysisampack.h 
- fixed typo: mi_rowkorr(T,A) -> mi_rowkorr(T)
 2002-11-12 13:28:26 +01:00
lenz@mysql.com
40027b8cff include/myisampack.h 
- fixed Typo: BIG_TABLE -> BIG_TABLES
 2002-11-12 13:21:44 +01:00
ram@mysql.r18.ru
206a59c8c3 fix for HEAP rb-tree indexes and BIG_TABLES problem (serg: thanks for discovery) 2002-11-11 13:34:47 +04:00
bar@bar.mysql.r18.ru
abd3427150 New field snprintf() in CHARSET_INFO structure 2002-11-10 16:14:39 +04:00
monty@hundin.mysql.fi
b0fae584b9 Portability fixes for HP compiler and HPUX11 2002-11-09 13:26:46 +02:00
monty@butch.
890b39bb68 merge 2002-11-07 12:49:01 +02:00
hf@genie.(none)
25bd1e9a37 Merged by hands 2002-11-07 12:20:08 +04:00
monty@butch.
a2bdf9265f Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
gluh@gluh.(none)
98579955d6 Merge sgluhov@work.mysql.com:/home/bk/mysql-4.0 
into gluh.(none):/home/gluh/mysql-4.0.bklast
 2002-11-06 12:19:06 +04:00
peter@mysql.com
ecedc7ac35 More work on secure authentication. Commit for merge 2002-11-05 20:21:55 +03:00
gluh@gluh.(none)
7bf903ea10 Error code for ssl connection 
Fix bug when server hang(with SSL, with modified libmysql)
Add options master-ssl-capath and master-ssl-cipher
Add some error checking(SSL)
 2002-11-05 12:05:58 +04:00
peter@mysql.com
26a1d8885d Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-31 13:02:29 +03:00
peter@mysql.com
cc18dc7291 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-30 18:03:09 +03:00
Sinisa@sinisa.nasamreza.org
26c6d970d9 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-10-30 16:59:49 +02:00
Sinisa@sinisa.nasamreza.org
5fbd7b63c5 changes for mysqladmin debug 
and a bug fix for derived tables
 2002-10-30 16:52:12 +02:00
vva@genie.(none)
4d22168d68 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 
into genie.(none):/home/vva/work/mysql-4.1.help/mysql-4.1.help_res
 2002-10-30 17:40:26 +04:00