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

1998 commits

Author SHA1 Message Date
jimw@mysql.com
da9a11669d Merge mysql.com:/home/jimw/my/mysql-4.1-wl2852 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-03 15:58:16 -07:00
msvensson@neptunus.(none)
7c8c14c435 Move "max-connect-retries" option to get alpabetichal order 2006-05-03 15:53:59 +02:00
msvensson@neptunus.(none)
5563a2f32f Add support for specifyihng the number of reconnec retries oin the command line 2006-05-03 14:04:54 +02:00
dlenev@mysql.com
5cae540501 Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 
into  mysql.com:/home/dlenev/mysql-5.1-merges
 2006-05-02 23:16:53 +04:00
holyfoot@mysql.com
aaf2c26e01 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.clean
 2006-05-02 09:01:13 +05:00
holyfoot@deer.(none)
aab0e9c24e Win build fix 2006-05-02 08:59:49 +05:00
jimw@mysql.com
052b126853 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-01 11:38:15 -07:00
jimw@mysql.com
7afa8aa73b Merge mysql.com:/home/jimw/my/mysql-5.1-18495 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-01 11:22:47 -07:00
jimw@mysql.com
c571f6ff57 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 10:59:14 -07:00
holyfoot@deer.(none)
9b832153f9 Fix for Win build 2006-05-01 22:16:08 +05:00
jimw@mysql.com
9ab852bb35 Merge mysql.com:/home/jimw/my/mysql-5.0-18312 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 09:11:57 -07:00
paul@polar.kitebird.com
7c4ddc8bd4 mysqlslap.c: 
Avoid embedding a bunch of whitespace in --help message.
 2006-04-28 10:44:08 -05:00
msvensson@neptunus.(none)
cccc2c4b6a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-28 08:33:42 +02:00
holyfoot@mysql.com
059e2f7005 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.upgd
 2006-04-28 09:19:53 +05:00
holyfoot@deer.(none)
5a75f865c2 bug #18115 (mysql_upgrade on Windows) 
pushed in 5.0
 2006-04-28 09:07:25 +05:00
msvensson@shellback.(none)
e5004d1312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-27 17:35:29 +02:00
msvensson@neptunus.(none)
31db4898c3 Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-26 22:24:25 +02:00
mskold@mysql.com
cb696feb0e Corrected include path to work under Windows 2006-04-26 17:00:58 +02:00
mskold@mysql.com
5eb07ec747 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 08:48:10 +02:00
cmiller@zippy.(none)
9ae7dd9e35 Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-24 16:17:50 -04:00
mskold@mysql.com
e95e6ddcb4 Fix for Bug #17840 mysqldump should not dump tables in database cluster, reuse existing define 2006-04-24 15:50:05 +02:00
mskold@mysql.com
14d8fdb295 Fix for Bug #17840 mysqldump should not dump tables in database cluster, skip cluster internal database 2006-04-24 15:39:49 +02:00
jimw@mysql.com
3761b25696 Bug #18495: mysqltest does not use the correct error number 
When looking up the error number for named errors in mysqltest .test
  files, we inadvertantly would match ER_WRONG_VALUE against
  ER_WRONG_VALUE_COUNT because we were using the length of the shorter
  string in strncmp(). Now we double-check the length of matches to
  make sure it was a complete match.
 2006-04-21 19:29:22 -07:00
msvensson@neptunus.(none)
29ace143a1 Backport fix for mysql client not using SSl library directly 
- Add function mysql_get_ssl_cipher
 - Use function mysql_get_ssl_cipher from mysql
 2006-04-22 00:48:13 +02:00
kent@mysql.com
1472ed2061 Merge 2006-04-21 20:04:13 +02:00
jimw@mysql.com
c28ea5b03b Bug #18312: mysqltest: --sleep=0 doesn't disable sleep 
Allow --sleep=0 to be specified to mysqltest, so that sleep calls
  can be disabled.

  Original patch from Paul DuBois.
 2006-04-21 10:48:53 -07:00
msvensson@neptunus.(none)
a51668c74c Bug#17208 SSL: client does not verify server certificate 
- Add new function 'ssl_verify_server_cert' which is used if we are 
   connecting to the server with SSL. It will compare the hostname in 
   the server's cert against the hostname that we used when connecting 
   to the server. Will reject the connection if hostname does not match.
 - Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
   which will turn on checking of servers cert.
 - Add new argument "ssl-verify-server-cert" to all mysql* clients which 
   will activate the above option.
 - Generate a new server cert with 1024 bits that has "localhost" as the server name.
 2006-04-18 17:58:27 +02:00
kent@mysql.com
64295d82d1 Merge 2006-04-18 17:16:27 +02:00
kent@mysql.com
58c153c629 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-18 10:34:56 +02:00
serg@mysql.com
98ea03931e mysql.cc: 
revert bug#16855 "fix" per Monty's request
 2006-04-18 10:16:06 +02:00
bar@mysql.com
aa8ab68fea Bug#17939: Wrong table format when using UTF8 strings 
Lines with column names consisting of national letters
were wrongly formatted in "mysql --table" results:

mysql> SELECT 'xxx xxx xxx' as 'xxx xxx xxx';
+-------------------+
| xxx xxx xxx |
+-------------------+
| xxx xxx xxx       |
+-------------------+
1 row in set (0.00 sec)

It happened because in UTF-8 (and other multibyte charsets)
the number of display cells is not always equal to the number
of bytes of the string.

Data lines (unlike column name lines) were formatted correctly,
because data lines were displayed taking in account number of
display cells. This patch takes in account number of cells when
displaying column names, the same way like displaying data lines does.

Note: The patch is going to be applied to 4.1.
Test case will be added after merge to 5.0,
into "mysql.test", which appeared in 5.0.

mysql.cc:
  Adding column name allignment using numcells(),
  the same to data alignment, which was implemented earlier.
 2006-04-17 12:33:45 +05:00
cmiller@zippy.(none)
7d282984f3 Only expand the empty string to the letters "NULL" if the column 
does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces.
 2006-04-16 17:17:36 -04:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
cmiller@zippy.(none)
c7513d482f Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-14 13:33:02 -04:00
tomas@poseidon.ndb.mysql.com
07753c59a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-13 10:48:24 +02:00
bpontz@shasta.mysql.com
19688a131a Child segfault when tring to call "mysql_error(NULL)", fixed by not 
assigning "mysql" variable from return value of mysql_real_connect.
 2006-04-12 23:16:15 -04:00
jimw@mysql.com
c490aff57e Merge mysql.com:/home/jimw/my/mysql-5.1-refactor 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-12 08:24:20 -07:00
tomas@poseidon.ndb.mysql.com
10692ba84f increase save_master_pos timeout to 30 seconds for higher test predictability 
better replicaiton test cleanup to ensure better test predictability
+ some ndb test cleanup
 2006-04-12 15:55:41 +02:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new, 
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
 2006-04-11 18:54:24 -07:00
msvensson@neptunus.(none)
ee76a12c09 Protect from empty --query argument 2006-04-11 23:24:06 +02:00
cmiller@zippy.(none)
a1e78b3d36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-11 16:39:09 -04:00
msvensson@neptunus.(none)
52c9feff13 Bug#18012 mysqlslap fails if querystring starts with delimiter 
- Terminate loop not only when the limit is met, but alse when there is no more stmts
 2006-04-11 22:23:16 +02:00
msvensson@neptunus.(none)
0bdb9ff547 Fix syntax error 2006-04-11 22:10:11 +02:00
msvensson@neptunus.(none)
5848a4276d Bug#17478 mysqlslap not issuing any queries 
- Add more printouts it depending on verbose level
 - New common function 'run_query' to be used when executing a query
 2006-04-11 22:04:08 +02:00
msvensson@neptunus.(none)
c8c8041804 Don't use the MYSQL* returned from mysql_real_connect to overwrite the already initalised mysql variable 2006-04-11 20:49:31 +02:00
msvensson@neptunus.(none)
53ff7dfbc9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-11 09:54:00 +02:00
msvensson@neptunus.(none)
8fe764fbb2 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-11 09:11:36 +02:00
kent@mysql.com
691822a929 mysql_upgrade.c: 
No declarations after first expression in block
 2006-04-11 02:48:19 +02:00
holyfoot@deer.(none)
b5afca05a4 WL#2645 (mysql_upgrade tool) 2006-04-10 20:54:43 +05:00
holyfoot@mysql.com
a5d18bc8ab Merging 2006-04-10 20:54:42 +05:00