mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
2aed7cf90e
(wrong error code) but I'll push it so that Sergei could clean up my merge include/mysqld_error.h: fixed typo mysql-test/r/order_by.result: updated result for merged test sql/Makefile.am: put back sql_union.cc lost during merge sql/mysql_priv.h: restored variables lost in the merge sql/mysqld.cc: put back lost variable declarations sql/share/czech/errmsg.txt: merge fix sql/share/danish/errmsg.txt: merge fix sql/share/dutch/errmsg.txt: merge fix sql/share/english/errmsg.txt: merge fix sql/share/estonian/errmsg.txt: merge fix sql/share/french/errmsg.txt: merge fix sql/share/german/errmsg.txt: merge fix sql/share/greek/errmsg.txt: merge fix sql/share/hungarian/errmsg.txt: merge fix sql/share/italian/errmsg.txt: merge fix sql/share/japanese/errmsg.txt: merge fix sql/share/korean/errmsg.txt: merge fix sql/share/norwegian-ny/errmsg.txt: merge fix sql/share/norwegian/errmsg.txt: merge fix sql/share/polish/errmsg.txt: merge fix sql/share/portuguese/errmsg.txt: merge fix sql/share/romanian/errmsg.txt: merge fix sql/share/russian/errmsg.txt: merge fix sql/share/slovak/errmsg.txt: merge fix sql/share/spanish/errmsg.txt: merge fix sql/share/swedish/errmsg.txt: merge fix sql/sql_acl.cc: merge fix
260 lines
4.2 KiB
Text
260 lines
4.2 KiB
Text
id idservice ordre description
|
|
2 1 10 Emettre un appel d'offres
|
|
2 3 40000 Créer une fiche de client
|
|
2 4 40010 Modifier des clients
|
|
2 5 40020 Effacer des clients
|
|
2 6 51050 Ajouter un service
|
|
2 7 51060 Liste des t2
|
|
name
|
|
Allan Larsson
|
|
David Axmark
|
|
Michael Widenius
|
|
name
|
|
Axmark David
|
|
Larsson Allan
|
|
Widenius Michael
|
|
i
|
|
1
|
|
2
|
|
3
|
|
i
|
|
1
|
|
3
|
|
2
|
|
i
|
|
3
|
|
2
|
|
1
|
|
i
|
|
3
|
|
2
|
|
1
|
|
i
|
|
2
|
|
1
|
|
3
|
|
id col1 col2
|
|
4 1 1
|
|
3 1 2
|
|
5 1 4
|
|
2 2 1
|
|
1 2 2
|
|
6 2 3
|
|
8 2 4
|
|
7 3 1
|
|
col1
|
|
2
|
|
2
|
|
1
|
|
1
|
|
1
|
|
2
|
|
3
|
|
2
|
|
id
|
|
1
|
|
1
|
|
1
|
|
2
|
|
2
|
|
2
|
|
2
|
|
3
|
|
id
|
|
2
|
|
2
|
|
1
|
|
1
|
|
1
|
|
2
|
|
3
|
|
2
|
|
test
|
|
1
|
|
2
|
|
3
|
|
7
|
|
a b if(b = 1,i,if(b = 2,v,''))
|
|
1 1 50
|
|
2 1 25
|
|
3 2 123 Park Place
|
|
4 2 453 Boardwalk
|
|
a b if(b = 1,i,if(b = 2,v,''))
|
|
1 1 50
|
|
2 1 25
|
|
3 2 123 Park Place
|
|
4 2 453 Boardwalk
|
|
DateOfAction TransactionID
|
|
1999-07-18 486
|
|
1999-07-19 87
|
|
1999-07-19 89
|
|
1999-07-19 92
|
|
1999-07-19 94
|
|
1999-07-27 828
|
|
1999-07-27 832
|
|
1999-07-27 834
|
|
1999-07-27 840
|
|
2000-03-27 490
|
|
2000-03-28 753
|
|
DateOfAction TransactionID
|
|
1999-07-19 87
|
|
1999-07-19 89
|
|
1999-07-19 92
|
|
1999-07-19 94
|
|
1999-07-18 486
|
|
2000-03-27 490
|
|
2000-03-28 753
|
|
1999-07-27 828
|
|
1999-07-27 832
|
|
1999-07-27 834
|
|
1999-07-27 840
|
|
member_id nickname voornaam
|
|
1
|
|
2
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 20 NULL 2 where used; Using index
|
|
a b c
|
|
1 NULL b
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 4 NULL 10 where used; Using index
|
|
a b c
|
|
2 3 c
|
|
2 2 b
|
|
2 2 a
|
|
2 1 b
|
|
2 1 a
|
|
1 3 b
|
|
1 1 b
|
|
1 1 b
|
|
1 1 NULL
|
|
1 NULL b
|
|
1 NULL NULL
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 ref a a 4 const 5 where used; Using index; Using filesort
|
|
a b c
|
|
1 3 b
|
|
1 1 NULL
|
|
1 1 b
|
|
1 1 b
|
|
1 NULL NULL
|
|
1 NULL b
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 ref a a 9 const,const 2 where used; Using index; Using filesort
|
|
a b c
|
|
1 NULL NULL
|
|
1 NULL b
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 9 NULL 8 where used; Using index; Using filesort
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 9 NULL 5 where used; Using index
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 ref a a 9 const,const 1 where used; Using index; Using filesort
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 9 NULL 6 where used; Using index
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 9 NULL 5 where used; Using index
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 9 NULL 2 where used; Using index; Using filesort
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 index NULL a 18 NULL 11 Using index
|
|
a b c
|
|
1 0
|
|
1 0 b
|
|
1 1
|
|
1 1 b
|
|
1 1 b
|
|
1 3 b
|
|
2 1 a
|
|
2 1 b
|
|
2 2 a
|
|
2 2 b
|
|
2 3 c
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 index NULL a 18 NULL 11 Using index
|
|
a b c
|
|
2 3 c
|
|
2 2 b
|
|
2 2 a
|
|
2 1 b
|
|
2 1 a
|
|
1 3 b
|
|
1 1 b
|
|
1 1 b
|
|
1 1
|
|
1 0 b
|
|
1 0
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 18 NULL 3 where used; Using index
|
|
a b c
|
|
1 1 b
|
|
1 1 b
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 4 NULL 6 where used; Using index
|
|
a b c
|
|
1 1 b
|
|
1 1 b
|
|
1 1
|
|
1 0 b
|
|
1 0
|
|
count(*)
|
|
9
|
|
a b c
|
|
2 3 c
|
|
2 2 b
|
|
2 2 a
|
|
2 1 b
|
|
2 1 a
|
|
1 3 b
|
|
1 1 b
|
|
1 1 b
|
|
1 1
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 8 NULL 10 where used; Using index
|
|
a b c
|
|
2 1 b
|
|
2 1 a
|
|
1 1 b
|
|
1 1 b
|
|
1 1
|
|
1 0 b
|
|
1 0
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 range a a 4 NULL 5 where used; Using index
|
|
a b c
|
|
1 3 b
|
|
1 1 b
|
|
1 1 b
|
|
1 1
|
|
1 0 b
|
|
1 0
|
|
gid sid uid
|
|
104620 5 15
|
|
103867 5 27
|
|
103962 5 27
|
|
104619 5 75
|
|
104505 5 117
|
|
103853 5 250
|
|
gid sid uid
|
|
104620 5 15
|
|
103867 5 27
|
|
103962 5 27
|
|
104619 5 75
|
|
104505 5 117
|
|
103853 5 250
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 index PRIMARY PRIMARY 4 NULL 6 Using index
|
|
t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1
|
|
t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 where used; Using index
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 index PRIMARY PRIMARY 4 NULL 6 Using index
|
|
t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 where used
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort
|
|
t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1
|
|
t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 where used; Using index
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort
|
|
t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 where used
|
|
table type possible_keys key key_len ref rows Extra
|
|
t1 ALL NULL NULL NULL NULL 6 Using temporary; Using filesort
|
|
t3 eq_ref PRIMARY PRIMARY 2 t1.skr 1 where used
|