mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12635 commits 2784 branches 343 tags 1.6 GiB
Commit graph

12635 commits

This branch
This branch
All branches
Author SHA1 Message Date
paul@ice.snake.net
a9a70d0742 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-07 09:21:54 -05:00
bar@bar.intranet.mysql.r18.ru
7d17da9018 mysqld.cc: 
WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation
 2004-06-07 18:33:17 +05:00
bar@bar.intranet.mysql.r18.ru
0860e3bfe4 mysqldump.c: 
Dump could fail to load because of --default-character-set command line option.
  More safe dump is now produces, --default-character-set doesn't matter.
 2004-06-07 18:12:23 +05:00
bar@bar.intranet.mysql.r18.ru
acbb3096b2 client.c: 
Bug #3990  	`--with-charset' ./configure's switch doesn'taffect mysql client library.
 2004-06-07 17:28:31 +05:00
brian@brian-akers-computer.local
f50066bdb9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-07 02:08:36 -07:00
brian@brian-akers-computer.local
589480e879 Last patch before push into main tree. Updated from code review and final once over. 
A couple of small changes to ha_example (mainly comments).
 2004-06-07 02:06:33 -07:00
bar@bar.intranet.mysql.r18.ru
b30b1ccc6a Bug #3928 regexp [[:>:]] and UTF-8 2004-06-07 12:51:18 +05:00
paul@ice.snake.net
bcae5017c3 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-06 18:51:57 -05:00
brian@brian-akers-computer.local
34ad857c8d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-05 22:58:13 -07:00
konstantin@mysql.com
dabc0e774e mysql_stmt_field_count() 2004-06-06 02:27:05 +04:00
konstantin@mysql.com
231ec66652 More comments in prepared statements code. 2004-06-06 00:33:16 +04:00
brian@brian-akers-computer.local
e24e1350a3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-05 10:43:22 -07:00
konstantin@mysql.com
21783e8537 Few more cleanups in client_test: 
No need for mysql_commit, especially after DDL statements.
 2004-06-05 03:09:53 +04:00
konstantin@mysql.com
1ae0504c6a The comment is not true any more. 
Is there a way to sefely use MYSQL_BIND structure without bzero?
 2004-06-05 02:56:50 +04:00
paul@ice.snake.net
fb15e3e73f mysql_install_db.sh: 
Correct a grammar error.
 2004-06-04 16:11:47 -05:00
paul@kite-hub.kitebird.com
d77a3f6db1 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2004-06-04 10:35:57 -05:00
konstantin@mysql.com
7d09dd999a HAVE_DEPRECATED_411_API macro removed. 2004-06-04 18:38:18 +04:00
monty@mysql.com
8b2a735563 Portability fixes (and a typo after last merge) 2004-06-04 11:02:35 +03:00
bar@bar.intranet.mysql.r18.ru
3f556025a7 charset.c: 
Typo fix.
  Thanks Vladimir Kolpakov who noticed it.
 2004-06-04 09:07:46 +05:00
guilhem@mysql.com
da835a0a06 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-06-03 23:19:01 +02:00
guilhem@mysql.com
86e8ecc965 Implementation of WL#1824 "Add replication of character set variables in 4.1", 
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill. 
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
 variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
 properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
 2004-06-03 23:17:18 +02:00
paul@kite-hub.kitebird.com
2f0ca1ce42 Fix skipp -> skip once and for all. 
(Note: This affects only comments, not variable names.)
 2004-06-03 11:52:54 -05:00
tomas@mc05.(none)
deaa73fe42 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mm
 2004-06-03 16:31:47 +02:00
heikki@hundin.mysql.fi
347a21e118 fil0fil.c: 
Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
 2004-06-03 17:31:46 +03:00
heikki@hundin.mysql.fi
0dced9ea3b os0file.c, fil0fil.c: 
Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
 2004-06-03 17:02:37 +03:00
tomas@mc05.(none)
0fa5156fbf fixes for ndb and make distdir 2004-06-03 16:02:07 +02:00
tomas@mc05.(none)
73a4598cdf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-03 14:45:54 +02:00
bar@bar.intranet.mysql.r18.ru
23aee5621d Unicode collations: WL#916 
XML and "collation customization" language parsers.
 2004-06-03 17:45:53 +05:00
tomas@mc05.(none)
22e39a53a9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-03 13:22:55 +02:00
joreland@mysql.com
a106a8c7b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-03 13:22:54 +02:00
tomas@mc05.(none)
bf644e1785 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-03 13:15:55 +02:00
autotest@mc01.ndb.mysql.com
63fe3c7e73 Makefile.am: 
local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
configure.in:
  cleaned up ndb CXX flags and added optional flag possibility
 2004-06-03 13:15:54 +02:00
joreland@mysql.com
2d379b2311 More warnings in atrt 2004-06-03 13:14:03 +02:00
ndbdev@ndbmaster.mysql.com
947abbabb9 Setup connect string 2004-06-03 10:17:52 +02:00
joreland@mysql.com
9bdbd6318a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-03 08:13:10 +02:00
joreland@mysql.com
8e88ed19fe Fix for 840, invalid tuple size. 
Still don't know reason, but this works
 2004-06-03 08:09:04 +02:00
autotest@mc01.ndb.mysql.com
37c78059e9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mc01.ndb.mysql.com:/space/mysql-4.1-ndb
 2004-06-03 08:04:40 +02:00
autotest@mc01.ndb.mysql.com
e69afe3921 extern"C" bug 2004-06-03 08:03:37 +02:00
joreland@mysql.com
0a69e028b0 Fix for 3910 2004-06-03 03:56:12 +02:00
monty@mysql.com
5ddf741a8d portability fix 2004-06-03 02:13:19 +03:00
monty@mysql.com
eef24c7e43 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-03 01:58:33 +03:00
monty@mysql.com
42c35d4569 Added authentication code that was missed in merge 
Added new windows configuration
 2004-06-03 01:55:47 +03:00
heikki@hundin.mysql.fi
8dae598aa2 fil0fil.c: 
Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
 2004-06-02 18:19:28 +03:00
hf@deer.(none)
b8cf9f6afe Merging 2004-06-02 19:17:35 +05:00
hf@deer.(none)
7cf1d2596b wl 1562 (To improve RTree indexes) 
some changes to make code nicer
 2004-06-02 19:11:57 +05:00
joreland@mysql.com
e22b3f24c6 Update atrt to use new names of binaries 2004-06-02 13:11:10 +02:00
tomas@mc05.(none)
783c4f0873 fixed naming error 2004-06-02 12:37:43 +02:00
tomas@poseidon.ndb.mysql.com
d58d6e2b1c collapsed ndb start/stop scripts in mysql-test-run + ndb bin name changes 2004-06-02 10:37:42 +00:00
monty@mysql.com
4cb62eb001 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-02 12:14:36 +03:00
monty@mysql.com
e6c5715126 after merge fixes 2004-06-02 12:13:49 +03:00