Commit graph

750 commits

Author SHA1 Message Date
igor@rurik.mysql.com
26ecd86539 Conflict resolution 2003-07-16 13:35:34 -07:00
monty@mashka.mysql.fi
ebcc7b5a4f Support for variables with components
Added framework to create/drop and manager buffers for multiple key caches
2003-07-06 19:09:57 +03:00
monty@narttu.mysql.fi
42e5754a4b Fixed problem with stacksize on Unixware 2003-07-04 01:21:42 +03:00
bell@sanja.is.com.ua
2a33b0514e fixed uninitialized pointer 2003-07-01 19:05:08 +03:00
bell@sanja.is.com.ua
f1353c1dda merged 2003-07-01 10:03:20 +03:00
igor@rurik.mysql.com
236560e8b3 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-30 09:53:04 -07:00
igor@rurik.mysql.com
9a446b9797 mysqld.cc, handler.cc:
Added multiple key cache
2003-06-30 09:47:56 -07:00
jani@rhols221.adsl.netsonic.fi
541b0d5322 Added support for structured options (WL task ID 947). 2003-06-27 18:51:39 +03:00
bell@sanja.is.com.ua
76315814b7 Fixed error handling to be able do not interrupt update (907) (SCRUM)
fixed bug of current select pointer in subselect execution
fixed layuot
2003-06-25 01:19:09 +03:00
igor@rurik.mysql.com
5425591503 Merge 2003-06-18 07:31:23 -07:00
monty@narttu.mysql.fi
1e62d6070a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-06-14 11:38:09 +03:00
monty@narttu.mysql.fi
a1034db4b9 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
2003-06-14 11:37:42 +03:00
serg@serg.mylan
9f67e10d0d consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
igor@rurik.mysql.com
a0f3dcc3c8 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f547f2769f Many files:
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.
2003-06-12 04:29:02 -07:00
monty@narttu.mysql.fi
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
jani@ua126d19.elisa.omakaista.fi
058d8ed14b mysqld won't give a warning any more, if --user=user_name is used,
if 'user_name' is the current user and it is not root.
2003-06-05 16:56:38 +03:00
monty@narttu.mysql.fi
772adcbd99 Print error if we can't delete an alarm
More debugging variables
Increment aborted_threads in case of killed or too big packet
2003-06-05 12:29:13 +03:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
monty@narttu.mysql.fi
100a66e6cb Added [mysqld-base-version] as a default group for the mysqld server
Portability fix for Windows 64
2003-06-04 16:05:27 +03:00
venu@myvenu.com
8f57d0e2e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-06-03 18:45:53 -07:00
venu@myvenu.com
27469ec8b9 Windows build fixups with the latest source 2003-06-03 18:45:07 -07:00
monty@narttu.mysql.fi
f6a365a532 Small fixes (nothing nameworthy) 2003-06-01 23:40:01 +03:00
bar@bar.mysql.r18.ru
bb611fa0a2 mysqlshow and mysqldump now send their vharacter set to server
character_set_results is now the same with character_set_client by default
2003-05-30 23:09:35 +05:00
bar@bar.mysql.r18.ru
81f0fb6e18 character_set_server is now updatable
character_set_database was added
Code optimization: reuse more code for all character sets variables
2003-05-30 13:03:56 +05:00
bar@bar.mysql.r18.ru
67c6703463 --with-collation argument for configure. Now one can for example use this:
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
2003-05-28 16:23:04 +05:00
monty@narttu.mysql.fi
381492093e Fixed problem with mysql prompt when server disconnect. (Bug 356)
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)
2003-05-27 16:40:14 +03:00
wax@kishkin.ru
3d0e24caf2 Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4sm 2003-05-27 04:42:47 +06:00
monty@narttu.mysql.fi
553637cbc4 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-05-26 20:35:27 +03:00
monty@narttu.mysql.fi
873033932a Fixed bug when installing mysqld as a service with 2 arguments (option + service-name) 2003-05-26 20:09:53 +03:00
monty@mashka.mysql.fi
bd4b9522e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
2003-05-26 19:03:25 +03:00
monty@mashka.mysql.fi
68a159b1fa New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set 2003-05-26 19:01:20 +03:00
monty@narttu.mysql.fi
1b14aa0d93 Merge with 3.23 to get fix for kill mysqld-pid 2003-05-26 17:55:49 +03:00
monty@narttu.mysql.fi
01de316fc2 Fixed problem with 'kill pid-of-mysqld' on Mac OS X 2003-05-26 17:24:16 +03:00
monty@narttu.mysql.fi
48ecf0e8a7 Fixed core dump bug when shuting down mysqld 2003-05-26 13:10:08 +03:00
bar@bar.mysql.r18.ru
f6a7dd7491 mysqld.cc:
default_collation is now displayed correctly in mysqld --help
  mysqld --help now displays default_collation corretly, according to --default-character-set
2003-05-22 18:22:21 +05:00
monty@mashka.mysql.fi
944bc89561 Updated results & after merge fix 2003-05-22 11:58:39 +03:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
monty@mashka.mysql.fi
6aa8929cf3 After merge fixes
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
bar@bar.mysql.r18.ru
8d52377a5c Some SHOW VARIABLES have been renamed:
collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server

SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
2003-05-21 17:44:12 +05:00
bar@bar.mysql.r18.ru
7f771ce2e1 "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
"character_set_system" has been added to display the system character set
2003-05-21 13:58:30 +05:00
bar@bar.mysql.r18.ru
76900a9f4b Two separate startup arguments for mysqld:
--default-character-set and --default-collation
2003-05-21 12:26:35 +05:00
wax@kishkin.ru
93325f7b6c add check of __NT__ definition for shared_memory for tree 4.1 2003-05-21 04:57:59 +06:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
c01678bc3d Added option --read-only (Thanks to Markus Benning) 2003-05-19 12:01:38 +03:00
monty@narttu.mysql.fi
524878e935 Fix for when compiling with HAVE_ISAM enabled 2003-05-19 11:53:42 +03:00
monty@narttu.mysql.fi
dad4025e3f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-19 11:09:46 +03:00
monty@narttu.mysql.fi
755c89e29f Add empty() function for baselist. 2003-05-19 11:09:24 +03:00