mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
14212 commits 2780 branches 343 tags 1.6 GiB
Commit graph

934 commits

Author SHA1 Message Date
sergefp@mysql.com
d7dd97089e Manually merged, requirees more merging 2004-05-25 08:15:50 +04:00
konstantin@mysql.com
f207b33a7b Support for character set conversion in binary protocol: another go 
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first.
 2004-05-25 02:03:49 +04:00
sergefp@mysql.com
ef260fa754 Merge 2004-05-24 21:13:38 +04:00
sergefp@mysql.com
f75b1adece Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-05-21 04:31:07 +04:00
sergefp@mysql.com
fb17025b3e WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2) 2004-05-21 04:27:50 +04:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
 2004-05-19 16:38:12 +03:00
monty@mishka.local
a79a3f5724 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.local:/home/my/mysql-4.1
 2004-05-16 14:49:32 +03:00
monty@mishka.local
314a8bf114 key_cmp -> key_cmp_if_same 
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
 2004-05-16 14:48:32 +03:00
ingo@mysql.com
7b4cbcf5e6 Update casts from very old my_lock.c source. 2004-05-10 21:52:24 +02:00
monty@mysql.com
6827fe4086 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-05 21:24:45 +03:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
miguel@hegel.local
634a024fa9 Fixes for prior commit 2004-05-05 10:54:11 -03:00
miguel@hegel.local
8d1480f7c5 Windows fixes for VC++ compiler compability 2004-05-05 02:59:17 -03:00
ingo@mysql.com
5a78b4c746 WL#1700 - Properly count key_blocks_used and key_blocks_current. 
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable 
which can be queried by "show status like key_blocks_unused".
 2004-05-03 15:55:21 +02:00
serg@serg.mylan
d9bed7491f better followup fix for my_getopt (Argh!) 2004-04-30 23:12:37 +02:00
serg@serg.mylan
f2e5a78297 followup - error fixed 2004-04-30 22:52:08 +02:00
monty@mysql.com
32d0b69503 Allow one to send empty strings with mysql_stmt_send_long_data() 
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
Fixed problem with symlink test (bug in 4.1.2)
 2004-04-28 20:19:50 +03:00
serg@serg.mylan
8837e8f5c0 bug#3529 - my_getopt doesn't process short OPT_ARG options correctly 
cleanup
 2004-04-28 15:33:03 +02:00
serg@serg.mylan
2bcfab10ea bug#3556 - soundex 2004-04-28 14:19:02 +02:00
sergefp@mysql.com
cc2eb9d5c3 Renamed MY_LEX_COLON to MY_LEX_SEMICOLON (at Serg's request) 2004-04-28 01:49:05 +04:00
monty@mishka.local
4999203fbd Fixed results for previous patch 
Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed
 2004-04-27 17:32:40 +03:00
monty@mysql.com
f96c4941d8 Fixed problems noticed with last build 2004-04-09 07:12:41 +03:00
dlenev@jabberwock.localdomain
a80f46bfdf WL#775 "Add status variable identifying binlog_cache_size shortage" 
Added two status variables: 
  binlog_cache_use - counts number of transactions that used somehow
    transaction temporary binary log.
  binlog_cache_disk_use - counts number of transactions that required
    disk I/O for storing info in this this binary log.
 2004-04-02 00:47:20 +04:00
bar@bar.intranet.mysql.r18.ru
745e130ae9 charset2html.c: 
Don't print control characters
 2004-03-26 14:46:42 +04:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
monty@mysql.com
eb91f7b478 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-25 15:05:42 +02:00
monty@mysql.com
ebc3b3afac BTREE-indexes in HEAP tables can now be used to optimize ORDER BY 
Don't read character set files if we are using only the default charset. In most cases the user will not anymore get a warning about missing character set files
Compare strings with space extend instead of space strip. Now the following comparisons holds:  "a" == "a " and "a\t" < "a". (Bug #3152).
Note: Because of the above fix, one has to do a REPAIR on any table that has an ascii character < 32 last in a CHAR/VARCHAR/TEXT columns.
 2004-03-25 15:05:01 +02:00
serg@serg.mylan
01cabfe58c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-03-25 11:33:41 +01:00
serg@serg.mylan
d8a9a8267b shared IO_CACHE: protection against remove_io_share in a wrong time 
bug#3134
 2004-03-25 11:22:01 +01:00
bar@bar.intranet.mysql.r18.ru
3827fa5589 Unicode Collation Algorithm subset implementation 2004-03-24 16:16:08 +04:00
bell@sanja.is.com.ua
23a74015f1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-conf-4.0
 2004-03-23 22:11:50 +02:00
serg@serg.mylan
4f4668ef20 comment 2004-03-23 19:25:30 +01:00
bar@bar.intranet.mysql.r18.ru
d82d09b699 .del-uca-dump.c~da786d5a909db27a: 
Delete: mysys/uca-dump.c
 2004-03-22 15:13:47 +04:00
bell@sanja.is.com.ua
8215fbe957 fixed config parser to recognize correctly strings like following: 
test="\"#no comment here"#real comment
 2004-03-20 23:50:04 +02:00
monty@mysql.com
042af556d5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-20 12:50:12 +02:00
monty@mysql.com
59f9dcd51d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-20 12:49:17 +02:00
bar@bar.intranet.mysql.r18.ru
f3c4bda023 uca-dump.c: 
new file
 2004-03-19 16:29:37 +04:00
bar@bar.intranet.mysql.r18.ru
fc17aad767 min_sort_char was added, for the future UCA implementation. 
UCS2 now has its own my_like_range function.
 2004-03-19 10:00:46 +04:00
monty@mysql.com
75dda82526 Removed compiler warning 
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
 2004-03-18 14:53:38 +02:00
serg@serg.mylan
b044a4266b Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-03-16 22:25:16 +01:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
monty@mysql.com
4ee44751d9 Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882) 2004-03-10 13:46:11 +02:00
serg@serg.mylan
3d7bb0f970 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-03-07 22:07:12 +01:00
monty@mysql.com
ef971bb604 Ensure that one can't from the command line set a variable too small. (Bug #2710) 
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"
 2004-03-06 10:43:35 +02:00
monty@mysql.com
9618683f3c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-05 19:50:12 +02:00
monty@mysql.com
8f093d0fb3 Portability fixes 2004-03-05 19:49:50 +02:00
serg@serg.mylan
4edc7584de comment clarified 2004-03-05 18:09:32 +01:00
greg@mysql.com
54c1debc1c Enhanced my_getsystime for NetWare. 2004-03-04 22:59:04 -01:00
monty@mashka.mysql.fi
93dd971bed Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2004-03-04 10:07:32 +02:00
monty@mashka.mysql.fi
afd8f38f4e Optimized GIS functions 2004-03-04 08:50:37 +02:00
serg@serg.mylan
a05c54b6c2 my_getsystime() 2004-03-02 22:21:12 +01:00
serg@serg.mylan
ed2e1aa14d my_gethwaddr() for linux/freebsd 
UUID() function
 2004-02-27 20:30:08 +01:00
serg@serg.mylan
e58f1ca7f8 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-26 00:25:35 +01:00
serg@serg.mylan
4442cf5b6f in netware ':' is also a valid path character 2004-02-24 23:15:38 +01:00
monty@mashka.mysql.fi
1ae05760ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2004-02-22 11:01:28 +02:00
serg@serg.mylan
fc16e4ded3 fix for --open-files-limit and broken query_cache_merge.test 2004-02-20 23:42:06 +01:00
monty@mashka.mysql.fi
494e43c1f5 merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
monty@mysql.com
14dc56b2a1 Fixed usage of strxnmov() in recent changesets 2004-02-19 22:04:31 +02:00
monty@mashka.mysql.fi
cdaf7fcbc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2004-02-19 19:38:47 +02:00
monty@mashka.mysql.fi
e347f63192 Max open files handling moved to my_set_max_open_files() 
This ensures that my_file_info takes this the max number of files into account and one can now use --open-files-limit on windows to increase number of used files up to 2048
 2004-02-19 19:33:09 +02:00
serg@serg.mylan
7a03cf04af potential problem fixed afer some reasoning 2004-02-19 09:11:46 +01:00
serg@serg.mylan
abfa3f0a98 missing semicolon 2004-02-17 21:12:24 +01:00
wax@mysql.com
67677dcba8 Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1
 2004-02-17 05:15:10 +05:00
wax@kishkin.ru
f38b08af91 correct cleaning of TZ 
add a check of the version Visual C
 2004-02-17 05:09:42 +05:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
monty@mysql.com
f43093ec0e After merge fixes 
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
 2004-02-16 10:03:25 +02:00
serg@serg.mylan
01c2ca5b8a Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-13 15:30:00 +01:00
serg@serg.mylan
4680c86bff warning: `link_into_queue' declared inline after being called 
warning: `unlink_from_queue' declared inline after being called
let's un-inline them, compiler can usually decide better what should be inlined
 2004-02-12 18:35:44 +01:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
konstantin@mysql.com
2a4cfe8b4f merge 3.23 -> 4.0, 2003/02/06 2004-02-06 15:23:41 +03:00
serg@serg.mylan
415dff4909 reverted 
fixed in 4.0 properly
 2004-02-05 22:08:29 +01:00
monty@mysql.com
480b082cf4 merge 2004-02-05 18:14:48 +01:00
monty@mysql.com
6bfede9639 Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects. Needed for proper fix for bug #2479. 
Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
 2004-02-05 10:22:08 +01:00
jani@ua141d10.elisa.omakaista.fi
a3dc5449e9 Added new option --sync-frm / --skip-sync-frm 
Marked --bdb-no-sync as deprecated
Added --sync-bdb-logs / --disable-sync-bdb-logs as a synonym / alternative.
 2004-02-03 18:10:45 +00:00
konstantin@mysql.com
74a1d68d3b Proposed (version #2) fix for bug #1948: 
"system variable query_prealloc_size can be only global"
 2004-02-02 23:01:58 +03:00
ram@gw.mysql.r18.ru
f231d9826b just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
jani@rhols221.adsl.netsonic.fi
0680d16595 Reverted an addition to be able to use ';' as a comment 
starting character elsewhere than in the beginning of a line,
because it affected some innodb options that had ';'
in them.
 2004-01-23 15:31:16 +02:00
serg@serg.mylan
b68a83a050 patch reverted - USE_RAID is defined in my_config.h 2004-01-23 11:56:37 +01:00
serg@serg.mylan
fbf4299b5c Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-01-22 14:46:54 +01:00
serg@serg.mylan
905a548ee8 no unnecessary includes (Intel ecc 7.0 compatibility fix) 2004-01-21 20:25:49 +01:00
monty@mysql.com
b078d2df64 merge 2004-01-20 00:15:01 +01:00
monty@mysql.com
0eb6070068 Code cleanup 
Fixed bug in optimizer where it didn't choose right table order in some cases
 2004-01-19 23:51:17 +01:00
bar@bar.intranet.mysql.r18.ru
f802ec0215 UCS-2 aligning 0xAA -> 0x00AA 2004-01-19 19:16:30 +04:00
konstantin@mysql.com
5def5b6853 typo fixed PPTHREAD -> PTHREAD 2004-01-16 21:01:58 +03:00
bar@bar.intranet.mysql.r18.ru
1d75d8d5aa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2004-01-15 17:08:45 +04:00
bar@bar.intranet.mysql.r18.ru
db83208d36 charset.c: 
http://bugs.mysql.com/bug.php?id=2386
  Index.xml file larger than 1024*16
  Fix for the above bug.
 2004-01-15 17:07:29 +04:00
lenz@kallisto.local
3ceef284df - no C++ comments in .c files, please... 2004-01-15 13:32:12 +01:00
jani@rhols221.adsl.netsonic.fi
1cc08ed699 Fixed Bug#2123, mysqld segmentation faulted when it tried to 
open a file that already existed. The problem was that end_io_cache()
was called even if init_io_cache() was not. This affected both
OUTFILE and DUMPFILE (both fixed). Sometimes wrongly aligned pointer was freed,
sometimes mysqld core dumped.

Other problem was that select_dump::send_error removed the dumpfile,
even if it was created by an earlier run, or by some other program, if
the file permissions just permitted it. Fixed it so that the file will
only be deleted, if an error occurred, but the file was created by mysqld
just a moment ago, in that thread.

On the other hand, select_export did not handle the corresponding garbage
file at all. Both fixed.

After these fixes, a big part of the select_export::prepare and select_dump::prepare
code became identical. Merged the code into a new function called create_file(),
which is now called by the two latter functions.

Regards,
Jani
 2004-01-15 06:48:31 +02:00
jani@rhols221.adsl.netsonic.fi
0d19a14ade Added handling for ; comment character as there was for #. 
Bug#2080
 2004-01-15 04:00:21 +02:00
jani@rhols221.adsl.netsonic.fi
2efb415121 - Added missing documentation to some mysql.cc options. 
- Fixed Bug#2346
- Fixed Bug#2378
- Fixed bug in pager (no Bug#ID (?))
- Added support for new special situations option type, GET_DISABLED.
  See handling of --debug in mysql.cc. compiled wihtout debugging, as an
  example.
 2004-01-14 04:58:37 +02:00
bar@bar.intranet.mysql.r18.ru
042fe0bed4 charset.c: 
Fixed: client crashed when there are no Index.xml file.
 2004-01-12 14:31:04 +04:00
bar@bar.intranet.mysql.r18.ru
10f0bf3507 charset.c: 
he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:
 2003-12-24 16:04:26 +04:00
bar@bar.intranet.mysql.r18.ru
c49773237d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-12-19 19:15:55 +04:00
bar@bar.intranet.mysql.r18.ru
5be2b8b11a Fix for Bug#2151: 
"USE db"  affected the character set of further CREATE DATABASEs,
which should have not happened.
 2003-12-19 19:12:11 +04:00
monty@mysql.com
031390a9a4 Fixes after merge with 4.0 
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
 2003-12-19 16:25:50 +02:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
monty@mysql.com
56f0abf7bb Portability fixes (mostly test suite) 
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1)
Fix when using symlinked data files and realpath() is not working
 2003-12-16 13:20:17 +02:00
monty@mysql.com
bd92d9b9ae Merge 2003-12-13 04:04:38 +02:00
monty@mysql.com
f995a5f4aa Fix autoincrement for signed columns (Bug #1366) 
Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test
 2003-12-12 22:26:58 +02:00