kostja@oak.local
36dd82c1d5
merge commit, hope that none of bar and dlenev changes were
...
lost.
2003-09-03 14:12:10 +04:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
igor@rurik.mysql.com
2090d57929
key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:
...
After merge fix
2003-08-26 15:14:13 -07:00
igor@rurik.mysql.com
40193a7fa5
Manual merge
2003-08-26 00:13:22 -07:00
serg@serg.mylan
a72587ffb0
sorted
2003-08-21 10:44:17 +02:00
monty@mashka.mysql.fi
eb6458cb18
After merge fixes + bugs from last merge
2003-08-19 16:00:12 +03:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
monty@narttu.mysql.fi
d79cbc3b99
Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected)
...
Changed some non fatal myisamchk error messages to warnings
2003-08-17 14:10:15 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
igor@rurik.mysql.com
2813cd1f0b
set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:
...
Added key cache parameters for midpoint insertion strategy
Many files:
Added midpoint insertion strategy for key cache
mi_test2.c:
Added a parameter to resize_key_cache
2003-08-09 11:12:22 -07:00
igor@rurik.mysql.com
f7adcbff7b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-02 03:27:13 -07:00
igor@rurik.mysql.com
9306f55d8e
Many files:
...
Added key cache assignment
mi_locking.c:
Added key cache assignment: correction
my_sys.h:
Added key cache variable structure
2003-08-02 02:43:18 -07:00
kostja@oak.local
50d3291aee
manual merge
2003-07-31 17:11:52 +04:00
bar@bar.mysql.r18.ru
c2a7768b56
A new separate error message: Unknown collation 'blablabla'
2003-07-29 17:12:14 +05:00
gluh@gluh.mysql.r18.ru
333bddb33f
SCRUM:
...
Task 499 'init_connect, init_slave options'
2003-07-18 14:11:01 +05:00
kostja@oak.local
941a8623ca
resolved conflict with pulled changeset
2003-07-09 18:24:43 +04:00
kostja@oak.local
a232225b69
Preliminary support for options --secure-auth,
...
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
2003-07-08 02:36:14 +04: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
guilhem@mysql.com
9c73d91d54
WL#912 (more user control on relay logs):
...
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
2003-07-06 17:59:54 +02:00
monty@mashka.mysql.fi
81a84424ee
SET CHARACTER SET DEFAULT didn't work (Bug #462 )
2003-06-29 12:58:43 +03:00
monty@mashka.mysql.fi
34919a03c4
Added thread variable max_seeks_for_key
...
Change optimizer to prefer key lookups before table scan
Change table scans to be done after tables with constrains on scanned table
2003-06-27 03:04:54 +03:00
gluh@gluh.mysql.r18.ru
289d375f50
SCRUM
...
Task ID 894:
Backport default_week_format variable to 4.0
2003-06-19 14:02:19 +05: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
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
guilhem@mysql.com
e04a9e6740
We now require SUPER privilege for SET PSEUDO_THREAD_ID.
2003-06-11 17:07:33 +02:00
monty@narttu.mysql.fi
dad0664579
merge with public tree
2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
f5bb1e0907
After merge fix
2003-06-04 23:17:01 +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
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
adb8c7e040
SET character_set_results=NULL is now working
2003-05-30 13:56:02 +05:00
bar@bar.mysql.r18.ru
0cb3f34806
set_var.cc, set_var.h:
...
character_set_connection new variable
2003-05-30 13:24:24 +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
monty@narttu.mysql.fi
bdb66d24dd
ORDER BY optimization
...
Fixed new bug when reading field types
2003-05-27 18:40:37 +03:00
monty@narttu.mysql.fi
102c477760
Added testing of LOAD DATA ... STARTING BY
...
Added read_only variable
2003-05-26 11:47:03 +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
189d1373b8
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:59:00 +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
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
jani@hynda.(none)
447bebfd77
Fixed a bug in DROP DATABASE when database had a RAID type table.
...
Bug ID 381.
2003-05-13 22:28:34 +03:00
jani@hynda.(none)
c9c5841760
- Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342
...
- Fix for QNX: UNIX sockets available since 6.2.1
2003-05-13 19:34:51 +03:00
serg@serg.mylan
431639a785
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-05-05 00:30:18 +02:00
serg@serg.mylan
12e53eb9e1
parallel-repair available in mysqld
2003-05-04 18:43:37 +02:00
peter@mysql.com
afafe36b3e
Added innodb_max_dirty_pages_pct parameter to limit amount
...
of dirty pages in the buffer pool (can be changed online)
2003-05-04 14:41:21 +04:00