monty@mysql.com
8ba52759a3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-02 21:40:55 +02:00
monty@mysql.com
2185f1a56c
Remove usage of !$ from mysql-tests
...
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
2004-11-02 20:13:27 +02:00
rburnett@build.mysql.com
8b472a7605
Bug# 5303 Windows --log-error option doesn't work correctly
2004-11-02 18:18:21 +01:00
marko@hundin.mysql.fi
a3294186ec
mysqld.cc:
...
Describe innodb_max_purge_lag
Improve description of innodb_table_locks
2004-11-01 12:08:44 +02:00
marko@hundin.mysql.fi
b5f49a3abd
Backport innodb_max_purge_lag from 4.1
2004-10-27 13:33:11 +03:00
bar@mysql.com
217d83a69f
Bug#6202: ENUMs are not case sensitive even if declared BINARY
2004-10-25 17:51:26 +05:00
monty@mysql.com
e1218474b8
Merge with 4.0
2004-10-20 16:24:28 +03:00
monty@mysql.com
b32ffec8fd
Fix test case for innodb-lock
2004-10-20 16:04:28 +03:00
monty@mysql.com
1f8b3d0f22
Code cleanups (done during review of new code)
...
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
2004-10-20 11:24:08 +03:00
monty@mishka.local
04c23808a8
Review of all code pushed since last review
...
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
2004-10-20 01:28:42 +03:00
dellis@goetia.(none)
34e5df0d36
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
2004-10-17 18:47:08 -05:00
dellis@goetia.(none)
b9509655a5
mysqld.cc:
...
BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.
2004-10-17 18:44:51 -05:00
marko@hundin.mysql.fi
edb93ca441
Added startup option and settable session variable
...
innodb_table_locks_old_behavior: do not acquire an
InnoDB table lock for LOCK TABLES, as in mysql-4.0.18
and earlier.
2004-10-13 22:54:21 +03:00
monty@mysql.com
546c2bd6ab
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-07 12:37:21 +03:00
monty@mysql.com
6239edc1d1
After merge fixes
...
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
2004-10-07 10:50:13 +03:00
rburnett@build.mysql.com
4a01f3030b
Enabled the writing of a pid file on Windows.
...
mysqld.cc:
Added call to create_pid_file to start_signal_handler on windows. Also removed the #ifndef WINDOWS from two calls that deletes the pid file
2004-10-06 21:46:44 +02:00
monty@mysql.com
62f3cd6a31
Merge with 4.0 for 4.1 release
...
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
dellis@goetia.(none)
634df1c19c
mysqld.cc:
...
BUG #5731 Restrict key_buffer_size to 4GB on 64 bit platforms
2004-10-03 10:00:26 -05:00
joerg@mysql.com
b7f35f00cb
Solve compile problem for 4.0.22 on hpita2. (Backport of a 4.1 change)
2004-09-30 19:05:33 +02:00
marko@hundin.mysql.fi
1bd65d7715
InnoDB: implement innodb_max_purge_lag
2004-09-30 15:54:19 +03:00
marko@hundin.mysql.fi
9f92688b64
Made innodb_autoextend_increment accessible as a global variable.
2004-09-30 12:31:41 +03:00
guilhem@mysql.com
53d0daa3a0
Fix for BUG#3248 "Doc says MyISAM warns if disk full but it does not":
...
we force the message to the error log, and we make it more informative;
we treat EDQUOT like ENOSPC.
2004-09-24 11:54:37 +02:00
marko@hundin.mysql.fi
a660499cd9
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-09-16 19:09:38 +03:00
joerg@mysql.com
563c556694
Replace 'sete_id(__)' calls by 'setre_id(-1,__)' to solve the
...
missing prototyped problem (bug#5521).
2004-09-13 16:32:47 +02:00
ram@gw.mysql.r18.ru
0cb0ae35b6
After merge fix.
2004-09-08 17:38:57 +05:00
marko@hundin.mysql.fi
934a5c0b99
InnoDB: Add configuration option innodb_autoextend_increment
2004-09-07 16:26:38 +03:00
serg@serg.mylan
413a8753e2
merged
2004-09-07 15:18:53 +02:00
monty@mysql.com
9d8555c0f0
Merge with 4.0 to get latest bug fixes
2004-09-04 15:59:49 +03:00
ram@gw.mysql.r18.ru
3c85a363e5
A fix (bug #2631 : mlockall called after dropping root permissions).
2004-09-03 19:26:11 +05:00
miguel@hegel.txg.br
fc11887596
Fix for bug #5302
2004-09-02 01:17:28 -03:00
miguel@hegel.txg.br
ca42de54a1
Fix for bug #5302
2004-09-01 14:02:11 -03:00
monty@mysql.com
054cea4ca8
Merge with 4.0
2004-09-01 04:12:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12
Added global my_getopt_error_reporter function pointer which is
...
used in the handle_options() function (instead of using additional
handle_option() parameter). The default value of the
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05:00
serg@serg.mylan
49d49e2fcb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-30 16:32:10 +02:00
serg@serg.mylan
b60713c033
bug in my_strnncoll_utf8 (and friends) fixed
...
cleanups
better, charset-dependent, ft_max_len_for_sort value
2004-08-30 08:37:36 +02:00
paul@ice.snake.net
34dc3a86df
Minor edits to error messsage.
2004-08-28 13:07:47 -05:00
monty@mysql.com
f574cd4e8f
Code style fixes.
...
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
2004-08-28 00:49:54 +03:00
serg@serg.mylan
b4bb38e896
merged
2004-08-26 15:19:46 +02:00
rburnett@build.mysql.com
52a973c5ff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-25 06:39:19 +02:00
serg@serg.mylan
8f2d92c56a
manually merged
2004-08-24 17:24:23 +02:00
paul@kite-hub.kitebird.com
917aa465e2
mysqld.cc:
...
System variable names use underscores, not dashes.
Alphabetize variables in option struct for help message.
(will wait for okay to push)
2004-08-23 14:30:55 -05:00
tomas@poseidon.(none)
b8dfb7eaf1
reverted default setting of --ndbcluster if --ndb-connectstring is given
2004-08-23 15:12:38 +00:00
pem@mysql.com
66a3f65d98
Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0)
2004-08-23 15:29:55 +02:00
tomas@poseidon.(none)
efac41149c
small ndb switch fix
2004-08-23 09:15:42 +00:00
tomas@poseidon.(none)
552d841be2
stylistic fixes
2004-08-23 08:42:31 +00:00
tomas@poseidon.(none)
05853d95de
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-23 07:33:40 +00:00
paul@ice.snake.net
71a57bbeb7
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-20 13:10:05 -05:00
tomas@poseidon.(none)
91b352377c
added switch to mysqld to specify connectstring
2004-08-20 16:10:47 +00:00
paul@ice.snake.net
ab52a9d87a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-19 15:10:19 -05:00
rburnett@build.mysql.com
eb04e6da07
Bug #4466 Nothing in .err when mysql service ends because of malformed my.ini options
...
mysqld.cc:
Changed LOGLEVEL enum to loglevel
mysql_priv.h, log.cc:
Changed LOGLEVEL to loglevel. Removed startup_ from some of the DBUG_ENTER macros. Removed the print_msg_to_log function as it was unused.
my_getopt.c, my_getopt.h:
Renamed LOGLEVEL to loglevel to match coding standards
2004-08-19 17:56:32 +02:00